--- embedaddon/php/ext/odbc/php_odbc.c	2013/07/22 01:31:57	1.1.1.3
+++ embedaddon/php/ext/odbc/php_odbc.c	2013/10/14 08:02:27	1.1.1.4
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_odbc.c,v 1.1.1.3 2013/07/22 01:31:57 misho Exp $ */
+/* $Id: php_odbc.c,v 1.1.1.4 2013/10/14 08:02:27 misho Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1765,7 +1765,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARA
 		if (result_type & ODBC_NUM) {
 			zend_hash_index_update(Z_ARRVAL_P(return_value), i, &tmp, sizeof(zval *), NULL);
 		} else {
-			if (!*(result->values[i].name)) {
+			if (!*(result->values[i].name) && Z_TYPE_P(tmp) == IS_STRING) {
 				zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_P(tmp),	Z_STRLEN_P(tmp)+1, &tmp, sizeof(zval *), NULL);
 			} else {
 				zend_hash_update(Z_ARRVAL_P(return_value), result->values[i].name, strlen(result->values[i].name)+1, &tmp, sizeof(zval *), NULL);
@@ -2704,7 +2704,7 @@ PHP_FUNCTION(odbc_num_rows)
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 /* {{{ proto bool odbc_next_result(resource result_id)
-   Checks if multiple results are avaiable */
+   Checks if multiple results are available */
 PHP_FUNCTION(odbc_next_result)
 {
 	odbc_result *result;