diff options
| author | Scott Griepentrog <sgriepentrog@digium.com> | 2015-02-06 21:26:46 +0000 |
|---|---|---|
| committer | Scott Griepentrog <sgriepentrog@digium.com> | 2015-02-06 21:26:46 +0000 |
| commit | 7ca1a0da04f6363324274aa7065a12f613f6cee0 (patch) | |
| tree | 0483377d4b20e19c873b72f1b0161fad03beac08 /main/utils.c | |
| parent | a79c920aa1a1880b462253b51068adf0a8db99e2 (diff) | |
various: cleanup issues found during leak hunt
In this collection of small patches to prevent
Valgrind errors are: fixes for reference leaks
in config hooks, evaluating a parameter beyond
bounds, and accessing a structure after a lock
where it could have been already free'd.
Review: https://reviewboard.asterisk.org/r/4407/
........
Merged revisions 431583 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/utils.c')
| -rw-r--r-- | main/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/utils.c b/main/utils.c index 7032631f8..578a01e26 100644 --- a/main/utils.c +++ b/main/utils.c @@ -1856,7 +1856,7 @@ void ast_join_delim(char *s, size_t len, const char * const w[], unsigned int si /* Join words into a string */ if (!s) return; - for (x = 0; ofs < len && w[x] && x < size; x++) { + for (x = 0; ofs < len && x < size && w[x] ; x++) { if (x > 0) s[ofs++] = delim; for (src = w[x]; *src && ofs < len; src++) |