Fixes all over. If not all acceptable, please cherry-pick, or let me know so i can remove them. <!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [x] Tested changes locally on 5.1, compile tested on master - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1833
-- Commit Summary --
* dispatcher: Fix memleak in destination attributes * dispatcher: Stop searching if entry is found * dispatcher: remove duplicate code in ds_load_remove() * jansson: Fix reverse logic for JSON boolean * siputils: Return true if options_reply() succeeds * dispatcher: Don't take modulus of hash twice * jansson: Log column on parse error * jsonrpcs: Fix memleak with srjson_doc_t
-- File Changes --
M src/modules/dispatcher/dispatch.c (69) M src/modules/jansson/jansson_funcs.c (6) M src/modules/jansson/jansson_utils.c (2) M src/modules/jsonrpcs/jsonrpcs_mod.c (2) M src/modules/siputils/options.c (4)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1833.patch https://github.com/kamailio/kamailio/pull/1833.diff
Looks good for me, thank you. I think all changes should be also backported, only the refactoring from f32c643 probably not.
Merged #1833 into master.
4038a6046bc34c923 does not cleanly apply to 5.1, I omited this as well from backport as it is only a minor fix.
Just for the record, 56f1243 caused a crash because of a double free. Was reverted with pull request #1839
Just for the record, [56f1243](https://github.com/kamailio/kamailio/commit/56f12436c2637a0811da9cc55f48a18e...) caused a crash because of a double free. Was reverted with pull request #1839
Hmm, maybe that is different on master. I've been running that on 5.1 for over a year. I'll have a look.
Thank you - to be more precise, it was only partially reverted.
I see.
I seem to have commit in my dev tree that removes that line inadvertently. The line reinstating it shouldn't have been present in PR