summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/msql/php_msql.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 65b1febcb0..69169cea63 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
PHP 4.0 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 200?, Version 4.0.7-dev
+- Fixed a crash in msql_result() (Zeev)
- Added support for single dimensional SafeArrays and Enumerations.
Added an is_enum() function to check if a component implements an
enumeration. (Alan, Harald)
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 66639cb1a1..7a9444518d 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -849,11 +849,10 @@ PHP_FUNCTION(msql_result)
return_value->value.str.len = (sql_row[field_offset]?strlen(sql_row[field_offset]):0);
return_value->value.str.val = (char *) safe_estrndup(sql_row[field_offset],return_value->value.str.len);
}
+ return_value->type = IS_STRING;
} else {
ZVAL_FALSE(return_value);
}
-
- return_value->type = IS_STRING;
}
/* }}} */