helly Thu Dec 5 07:55:02 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/standard image.c
Log:
MFH: return FALSE
Index: php4/ext/standard/image.c
diff -u php4/ext/standard/image.c:1.44.2.3 php4/ext/standard/image.c:1.44.2.4
--- php4/ext/standard/image.c:1.44.2.3 Thu Oct 24 07:16:57 2002
+++ php4/ext/standard/image.c Thu Dec 5 07:55:02 2002
@@ -16,7 +16,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: image.c,v 1.44.2.3 2002/10/24 11:16:57 hyanantha Exp $ */
+/* $Id: image.c,v 1.44.2.4 2002/12/05 12:55:02 helly Exp $ */
/*
* Based on Daniel Schmitt's imageinfo.c which carried the following
* Copyright notice.
@@ -574,6 +574,7 @@
case 1:
if (zend_get_parameters_ex(1, &arg1) == FAILURE) {
+ RETVAL_FALSE;
WRONG_PARAM_COUNT;
}
convert_to_string_ex(arg1);
@@ -581,18 +582,20 @@
case 2:
if (zend_get_parameters_ex(2, &arg1, &info) == FAILURE) {
+ RETVAL_FALSE;
WRONG_PARAM_COUNT;
}
zval_dtor(*info);
if (array_init(*info) == FAILURE) {
- return;
+ RETURN_FALSE;
}
convert_to_string_ex(arg1);
break;
default:
+ RETVAL_FALSE;
WRONG_PARAM_COUNT;
break;
}
@@ -667,7 +670,7 @@
if (array_init(return_value) == FAILURE) {
php_error(E_ERROR, "Unable to initialize array");
efree(result);
- return;
+ RETURN_FALSE;
}
add_index_long(return_value, 0, result->width);
add_index_long(return_value, 1, result->height);
@@ -682,6 +685,8 @@
add_assoc_long(return_value, "channels", result->channels);
}
efree(result);
+ } else {
+ RETURN_FALSE;
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
