helly Sat Feb 24 14:28:09 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/exif exif.c
Log:
- Make debug code really safe
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.13&r2=1.173.2.5.2.14&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.13
php-src/ext/exif/exif.c:1.173.2.5.2.14
--- php-src/ext/exif/exif.c:1.173.2.5.2.13 Sat Feb 24 03:08:05 2007
+++ php-src/ext/exif/exif.c Sat Feb 24 14:28:09 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.173.2.5.2.13 2007/02/24 03:08:05 stas Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.14 2007/02/24 14:28:09 helly Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.13 2007/02/24 03:08:05
stas Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.14 2007/02/24 14:28:09
helly Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -1185,43 +1185,43 @@
case TAG_FMT_STRING:
case TAG_FMT_SBYTE:
dump = erealloc(dump, len + 4 + 1);
- snprintf(dump + len, 4, "0x%02X", *value_ptr);
+ snprintf(dump + len, 4 + 1, "0x%02X",
*value_ptr);
len += 4;
value_ptr++;
break;
case TAG_FMT_USHORT:
case TAG_FMT_SSHORT:
dump = erealloc(dump, len + 6 + 1);
- snprintf(dump + len, 6, "0x%04X",
php_ifd_get16s(value_ptr, motorola_intel));
+ snprintf(dump + len, 6 + 1, "0x%04X",
php_ifd_get16s(value_ptr, motorola_intel));
len += 6;
value_ptr += 2;
break;
case TAG_FMT_ULONG:
case TAG_FMT_SLONG:
dump = erealloc(dump, len + 6 + 1);
- snprintf(dump + len, 6, "0x%04X",
php_ifd_get32s(value_ptr, motorola_intel));
+ snprintf(dump + len, 6 + 1, "0x%04X",
php_ifd_get32s(value_ptr, motorola_intel));
len += 6;
value_ptr += 4;
break;
case TAG_FMT_URATIONAL:
case TAG_FMT_SRATIONAL:
dump = erealloc(dump, len + 13 + 1);
- snprintf(dump + len, 13, "0x%04X/0x%04X",
php_ifd_get32s(value_ptr, motorola_intel), php_ifd_get32s(value_ptr+4,
motorola_intel));
+ snprintf(dump + len, 13 + 1, "0x%04X/0x%04X",
php_ifd_get32s(value_ptr, motorola_intel), php_ifd_get32s(value_ptr+4,
motorola_intel));
len += 13;
value_ptr += 8;
break;
}
if (components > 0) {
- dump = erealloc(dump, len + 4 + 1);
- snprintf(dump + len, 4, ", ");
+ dump = erealloc(dump, len + 2 + 1);
+ snprintf(dump + len, 2 + 1, ", ");
len += 2;
components--;
} else{
break;
}
}
- dump = erealloc(dump, len + 2 + 1);
- snprintf(dump + len, 2, "}");
+ dump = erealloc(dump, len + 1 + 1);
+ snprintf(dump + len, 1 + 1, "}");
return dump;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
