cvs: php-src /ext/exif exif.c
| From: | Marcus Boerger | Date: | Thu, 04 Nov 2004 20:13:31 +0000 |
| Subject: | cvs: php-src /ext/exif exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29129@lists.php.net to get a copy of this message | ||
helly Thu Nov 4 15:13:31 2004 EDT
Modified files:
/php-src/ext/exif exif.c
Log:
Bug #30627
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.162&r2=1.163&ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.162 php-src/ext/exif/exif.c:1.163
--- php-src/ext/exif/exif.c:1.162 Tue Mar 16 15:58:01 2004
+++ php-src/ext/exif/exif.c Thu Nov 4 15:13:30 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.162 2004/03/16 20:58:01 derick Exp $ */
+/* $Id: exif.c,v 1.163 2004/11/04 20:13:30 helly Exp $ */
/* ToDos
*
@@ -111,7 +111,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.162 2004/03/16 20:58:01 derick Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.163 2004/11/04 20:13:30 helly Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -2734,7 +2734,7 @@
// JPEG does not use absolute pointers instead its pointers are relative to the start
// of the TIFF header in APP1 section.
*/
- if (offset_val+byte_count>ImageInfo->FileSize ||
(ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II &&
ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM)) {
+ if (offset_val+byte_count>ImageInfo->FileSize ||
(ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II &&
ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM &&
ImageInfo->FileType!=IMAGE_FILETYPE_JPEG)) {
if (value_ptr < dir_entry) {
/* we can read this if offset_val > 0 */
/* some files have their values in other parts of the file */