Attachment 931391 Details for Bug 1134339 – Patch for version 5.5.15

[patch] Patch for version 5.5.15

php-5.5.15-pdorealloc.patch (text/plain), 2.12 KB, created by Patrick Monnerat on 2014-08-27 10:45:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Monnerat

Created: 2014-08-27 10:45:29 UTC

Size: 2.12 KB

patch

obsolete

>diff -Naurp php-5.5.15.orig/ext/pdo_odbc/odbc_stmt.c php-5.5.15.new/ext/pdo_odbc/odbc_stmt.c
>--- php-5.5.15.orig/ext/pdo_odbc/odbc_stmt.c	2014-07-23 11:00:58.000000000 +0200
>+++ php-5.5.15.new/ext/pdo_odbc/odbc_stmt.c	2014-08-26 19:29:57.313458322 +0200
>@@ -468,37 +468,33 @@ static int odbc_stmt_param_hook(pdo_stmt
> 			
> 			case PDO_PARAM_EVT_EXEC_POST:
> 				P = param->driver_data;
>+
> 				if (P->outbuf) {
>-					if (P->outbuf) {
>-						unsigned long ulen;
>-						char *srcbuf;
>-						unsigned long srclen = 0;
>+					unsigned long ulen;
>+					char *srcbuf;
>+					unsigned long srclen = 0;
>+
>+					zval_dtor(param->parameter);
>+					ZVAL_NULL(param->parameter);
>+
>+					switch (P->len) {
>+						case SQL_NULL_DATA:
>+							break;
>+						default:
>+							switch (pdo_odbc_ucs22utf8(stmt, P->is_unicode, P->outbuf, P->len, &ulen)) {
>+								case PDO_ODBC_CONV_FAIL:
>+									/* something fishy, but allow it to come back as binary */
>+								case PDO_ODBC_CONV_NOT_REQUIRED:
>+									srcbuf = P->outbuf;
>+									srclen = P->len;
>+									break;
>+								case PDO_ODBC_CONV_OK:
>+									srcbuf = S->convbuf;
>+									srclen = ulen;
>+									break;
>+							}
> 
>-						switch (P->len) {
>-							case SQL_NULL_DATA:
>-								zval_dtor(param->parameter);
>-								ZVAL_NULL(param->parameter);
>-								break;
>-							default:
>-								convert_to_string(param->parameter);
>-								switch (pdo_odbc_ucs22utf8(stmt, P->is_unicode, P->outbuf, P->len, &ulen)) {
>-									case PDO_ODBC_CONV_FAIL:
>-										/* something fishy, but allow it to come back as binary */
>-									case PDO_ODBC_CONV_NOT_REQUIRED:
>-										srcbuf = P->outbuf;
>-										srclen = P->len;
>-										break;
>-									case PDO_ODBC_CONV_OK:
>-										srcbuf = S->convbuf;
>-										srclen = ulen;
>-										break;
>-								}
>-										
>-								Z_STRVAL_P(param->parameter) = erealloc(Z_STRVAL_P(param->parameter), srclen+1);
>-								memcpy(Z_STRVAL_P(param->parameter), srcbuf, srclen);
>-								Z_STRLEN_P(param->parameter) = srclen;
>-								Z_STRVAL_P(param->parameter)[srclen] = '\0';
>-						}
>+							ZVAL_STRINGL(param->parameter, srcbuf, srclen, 1);
> 					}
> 				}
> 				return 1;

Actions: View | Diff

Attachments on bug 1134339: 931390 | 931391