mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (avoid reallocation)

Browse Source
This commit is contained in:
Dmitry Stogov 2015-07-01 22:17:08 +03:00
parent d2d326a381
commit 887e5ad110
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/standard/iptc.c
View File

@ -183,7 +183,8 @@ PHP_FUNCTION(iptcembed)
FILE *fp;
unsigned int marker, done = 0;
int inx;
unsigned char *spoolbuf = NULL, *poi = NULL;
zend_string *spoolbuf = NULL;
unsigned char *poi = NULL;
zend_stat_t sb;
zend_bool written = 0;
@ -203,14 +204,15 @@ PHP_FUNCTION(iptcembed)
if (spool < 2) {
zend_fstat(fileno(fp), &sb);
poi = spoolbuf = safe_emalloc(1, iptcdata_len + sizeof(psheader) + sb.st_size + 1024, 1);
spoolbuf = zend_string_alloc(iptcdata_len + sizeof(psheader) + sb.st_size + 1024, 0);
poi = (unsigned char*)ZSTR_VAL(spoolbuf);
memset(poi, 0, iptcdata_len + sizeof(psheader) + sb.st_size + 1024 + 1);
}
if (php_iptc_get1(fp, spool, poi?&poi:0) != 0xFF) {
fclose(fp);
if (spoolbuf) {
efree(spoolbuf);
zend_string_free(spoolbuf);
}
RETURN_FALSE;
}
@ -218,7 +220,7 @@ PHP_FUNCTION(iptcembed)
if (php_iptc_get1(fp, spool, poi?&poi:0) != 0xD8) {
fclose(fp);
if (spoolbuf) {
efree(spoolbuf);
zend_string_free(spoolbuf);
}
RETURN_FALSE;
}
@ -285,9 +287,8 @@ PHP_FUNCTION(iptcembed)
fclose(fp);
if (spool < 2) {
// TODO: avoid reallocation ???
RETVAL_STRINGL((char *) spoolbuf, poi - spoolbuf);
efree(spoolbuf);
spoolbuf = zend_string_truncate(spoolbuf, poi - (unsigned char*)ZSTR_VAL(spoolbuf), 0);
RETURN_NEW_STR(spoolbuf);
} else {
RETURN_TRUE;
}