cvs: php4 /ext/exif exif.c
| From: | Rasmus Lerdorf | Date: | Sat, 04 Aug 2001 18:08:13 +0000 |
| Subject: | cvs: php4 /ext/exif exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6552@lists.php.net to get a copy of this message | ||
rasmus Sat Aug 4 14:08:13 2001 EDT
Modified files:
/php4/ext/exif exif.c
Log:
Fix newly introduced crash on a file-not-found
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.25 php4/ext/exif/exif.c:1.26
--- php4/ext/exif/exif.c:1.25 Fri Aug 3 23:06:12 2001
+++ php4/ext/exif/exif.c Sat Aug 4 14:08:13 2001
@@ -1137,7 +1137,7 @@
ret = php_read_jpeg_exif(&ImageInfo, Z_STRVAL_PP(p_name), readall);
- if (array_init(return_value) == FAILURE) {
+ if (ret==FALSE || array_init(return_value) == FAILURE) {
RETURN_FALSE;
}
add_assoc_string(return_value,"FileName",ImageInfo.FileName,1);