iliaa Thu Dec 28 15:10:54 2006 UTC
Modified files:
/php-src/main php_logos.c
Log:
MFB: strcat() stuff
http://cvs.php.net/viewvc.cgi/php-src/main/php_logos.c?r1=1.23&r2=1.24&diff_format=u
Index: php-src/main/php_logos.c
diff -u php-src/main/php_logos.c:1.23 php-src/main/php_logos.c:1.24
--- php-src/main/php_logos.c:1.23 Sat Aug 12 19:41:28 2006
+++ php-src/main/php_logos.c Thu Dec 28 15:10:54 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_logos.c,v 1.23 2006/08/12 19:41:28 nlopess Exp $ */
+/* $Id: php_logos.c,v 1.24 2006/12/28 15:10:54 iliaa Exp $ */
#include "php.h"
#include "logos.h"
@@ -78,13 +78,12 @@
if(FAILURE==zend_hash_find(&phpinfo_logo_hash, (char *) logo_string,
strlen(logo_string), (void **)&logo_image))
return 0;
- len=strlen(CONTENT_TYPE_HEADER)+logo_image->mimelen;
- content_header=malloc(len+1);
- if(!content_header) return 0;
- strcpy(content_header, CONTENT_TYPE_HEADER);
- strcat(content_header, logo_image->mimetype);
- sapi_add_header(content_header, len, 1);
- free(content_header);
+ len = sizeof(CONTENT_TYPE_HEADER) - 1 + logo_image->mimelen;
+ content_header = emalloc(len + 1);
+ memcpy(content_header, CONTENT_TYPE_HEADER, sizeof(CONTENT_TYPE_HEADER)
- 1);
+ memcpy(content_header + sizeof(CONTENT_TYPE_HEADER) - 1 ,
logo_image->mimetype, logo_image->mimelen);
+ content_header[len] = '\0';
+ sapi_add_header(content_header, len, 0);
PHPWRITE((char*)logo_image->data, logo_image->size);
return 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
