diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-16 09:04:38 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-16 09:04:38 +0000 |
| commit | 6f631293a89ba473158caf00b3d08a7f6c4dc0f5 (patch) | |
| tree | ce4ebdb51918f9af37fa1b6e96eca3d608181cf4 /res | |
| parent | 80a59d44f055c0c07ef92c83f8f2f3675d57b8fe (diff) | |
Merged revisions 298480 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r298480 | tilghman | 2010-12-16 03:03:40 -0600 (Thu, 16 Dec 2010) | 14 lines
Only increment the pointer once per loop, otherwise we corrupt the value.
(closes issue #18251)
Reported by: bcnit
Patches:
20101110__issue18251.diff.txt uploaded by tilghman (license 14)
Tested by: trev, jthurman, elguero
(closes issue #18279)
Reported by: zerohalo
Patches:
20101109__issue18279.diff.txt uploaded by tilghman (license 14)
Tested by: zerohalo
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@298481 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_config_odbc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index ef45bfc99..08527271c 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -61,7 +61,7 @@ struct custom_prepare_struct { static void decode_chunk(char *chunk) { for (; *chunk; chunk++) { - if (*chunk == '^' && strchr("0123456789ABCDEFabcdef", chunk[1]) && strchr("0123456789ABCDEFabcdef", chunk[2])) { + if (*chunk == '^' && strchr("0123456789ABCDEF", chunk[1]) && strchr("0123456789ABCDEF", chunk[2])) { sscanf(chunk + 1, "%02hhX", chunk); memmove(chunk + 1, chunk + 3, strlen(chunk + 3) + 1); } @@ -109,9 +109,8 @@ static SQLHSTMT custom_prepare(struct odbc_obj *obj, void *data) /* We use ^XX, instead of %XX because '%' is a special character in SQL */ snprintf(eptr, encodebuf + sizeof(encodebuf) - eptr, "^%02hhX", *vptr); eptr += 3; - vptr++; } else { - *eptr++ = *vptr++; + *eptr++ = *vptr; } } if (eptr < encodebuf + sizeof(encodebuf)) { |