From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 7 May 2014 17:50:52 +0000 (+0000)
Subject: Fix encoding of custom prepare extra data.
X-Git-Tag: 12.3.0-rc1~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ca83558ef7be7f3d1aaa9e7e0e752219f7f59e1;p=thirdparty%2Fasterisk.git

Fix encoding of custom prepare extra data.

Patches:
	res_config_odbc-take2.patch by John Hardin (License #6512)
........

Merged revisions 413396 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 413397 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@413398 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index 0805dcb60a..b293841d30 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -135,13 +135,13 @@ static SQLHSTMT custom_prepare(struct odbc_obj *obj, void *data)
 	}
 
 	if (!ast_strlen_zero(cps->extra)) {
-		if (strchr(cps->extra, ';') || strchr(cps->extra, '^')) {
-			ENCODE_CHUNK(encodebuf, cps->extra);
-			SQLBindParameter(stmt, x++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(encodebuf), 0, (void *)encodebuf, 0, NULL);
+		const char *newval = cps->extra;
+		if (strchr(newval, ';') || strchr(newval, '^')) {
+			ENCODE_CHUNK(encodebuf, newval);
+			ast_string_field_set(cps, encoding[x], encodebuf);
+			newval = cps->encoding[x];
 		} 
-		else {
-			SQLBindParameter(stmt, x++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(cps->extra), 0, (void *)cps->extra, 0, NULL);
-		}
+		SQLBindParameter(stmt, x++, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_CHAR, strlen(newval), 0, (void *)newval, 0, NULL);
 	}
 
 	return stmt;