cvs: php4 /ext/domxml php_domxml.c /ext/exif exif.c

sniper Sat May 18 20:02:07 2002 EDT Modified files: /php4/ext/domxml php_domxml.c /php4/ext/exif exif.c Log: DO NOT use C++ comments! Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.158 php4/ext/domxml/php_domxml.c:1.159 --- php4/ext/domxml/php_domxml.c:1.158 Sat May 18 16:19:43 2002 +++ php4/ext/domxml/php_domxml.c Sat May 18 20:02:05 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.158 2002/05/18 20:19:43 chregu Exp $ */ +/* $Id: php_domxml.c,v 1.159 2002/05/19 00:02:05 sniper Exp $ */ /* TODO * - Support Notation Nodes @@ -466,7 +466,7 @@ PHP_RINIT(domxml), NULL, PHP_MINFO(domxml), - DOMXML_API_VERSION, //Extension versionnumber + DOMXML_API_VERSION, /* Extension versionnumber */ STANDARD_MODULE_PROPERTIES }; @@ -2096,7 +2096,7 @@ RETURN_FALSE; } - // FIXME reverted xmlAddChildList; crashes + /* FIXME reverted xmlAddChildList; crashes */ child = xmlAddSibling(nodep, new_child); if (NULL == child) { Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.91 php4/ext/exif/exif.c:1.92 --- php4/ext/exif/exif.c:1.91 Sun Apr 14 16:47:21 2002 +++ php4/ext/exif/exif.c Sat May 18 20:02:07 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.91 2002/04/14 20:47:21 helly Exp $ */ +/* $Id: exif.c,v 1.92 2002/05/19 00:02:07 sniper Exp $ */ /* ToDos * @@ -107,7 +107,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.3 $Id: exif.c,v 1.91 2002/04/14 20:47:21 helly Exp $" +#define EXIF_VERSION "1.3 $Id: exif.c,v 1.92 2002/05/19 00:02:07 sniper Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -2253,9 +2253,11 @@ /* If its bigger than 4 bytes, the dir entry contains an offset. */ value_ptr = offset_base+offset_val; if (offset_val+byte_count > IFDlength || value_ptr < dir_entry) { + /* // It is important to check for IMAGE_FILETYPE_TIFF // JPEG does not use absolute pointers instead its pointers are relative to the start // of the TIFF header in APP1 section. + */ if (offset_val<0 || offset_val+byte_count>ImageInfo->FileSize || (ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II && ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM)) { if (value_ptr < dir_entry) { /* we can read this if offset_val > 0 */ @@ -2269,7 +2271,7 @@ return TRUE; } if (byte_count>sizeof(cbuf)) { - // mark as outside range and get buffer + /* mark as outside range and get buffer */ value_ptr = emalloc(byte_count); if (!value_ptr) { EXIF_ERRLOG_EALLOC @@ -2277,11 +2279,13 @@ } outside = value_ptr; } else { + /* // in most cases we only access a small range so // it is faster to use a static buffer there // BUT it offers also the possibility to have // pointers read without the need to free them // explicitley before returning. + */ value_ptr = cbuf; }