cvs: php4 /ext/exif exif.c
| From: | Marcus Boerger | Date: | Sat, 18 Jan 2003 19:06:31 +0000 |
| Subject: | cvs: php4 /ext/exif exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18005@lists.php.net to get a copy of this message | ||
helly Sat Jan 18 14:06:31 2003 EDT
Modified files:
/php4/ext/exif exif.c
Log:
correct my fault here and documnet the sense of the test
Index: php4/ext/exif/exif.c
diff -u php4/ext/exif/exif.c:1.139 php4/ext/exif/exif.c:1.140
--- php4/ext/exif/exif.c:1.139 Sat Jan 18 13:51:12 2003
+++ php4/ext/exif/exif.c Sat Jan 18 14:06:29 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.139 2003/01/18 18:51:12 iliaa Exp $ */
+/* $Id: exif.c,v 1.140 2003/01/18 19:06:29 helly Exp $ */
/* ToDos
*
@@ -95,7 +95,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.139 2003/01/18 18:51:12 iliaa Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.140 2003/01/18 19:06:29 helly Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -1486,12 +1486,11 @@
{
void *tmp;
+ /* This is not a malloc/realloc check. It is a plausibility check for the
+ * function parameters (requirements engineering).
+ */
if (section_index >= ImageInfo->file.count) {
EXIF_ERRLOG_FSREALLOC
- return -1;
- }
- tmp = erealloc(ImageInfo->file.list[section_index].data, size);
- if (size == 0 || section_index >= ImageInfo->file.count) {
return -1;
}
tmp = erealloc(ImageInfo->file.list[section_index].data, size);