Merge branch 'PHP-5.5' into PHP-5.6

weltling · weltling · commit b78f8220e798 · 2015-04-28T15:13:46.000+02:00
* PHP-5.5:
  updated NEWS
  Fixed bug #69381 out of memory with sage odbc driver
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -999,6 +999,15 @@ int odbc_bindcols(odbc_result *result TSRMLS_DC)
 			default:
 				rc = PHP_ODBC_SQLCOLATTRIBUTE(result->stmt, (SQLUSMALLINT)(i+1), colfieldid,
 								NULL, 0, NULL, &displaysize);
+#if defined(ODBCVER) && (ODBCVER >= 0x0300)
+				if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO && colfieldid == SQL_DESC_OCTET_LENGTH) {
+					 /* This is  a quirk for ODBC 2.0 compatibility for broken driver implementations.
+					  */
+					charextraalloc = 1;
+					rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_DISPLAY_SIZE,
+								NULL, 0, NULL, &displaysize);
+				}
+#endif
 				/* Workaround for Oracle ODBC Driver bug (#50162) when fetching TIMESTAMP column */
 				if (result->values[i].coltype == SQL_TIMESTAMP) {
 					displaysize += 3;
