cvs: php-src(PHP_5_2) /ext/zip/lib zip_close.c

pajoye Thu Jan 1 19:32:24 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/zip/lib zip_close.c Log: - restore fix for binary mode on win (regression introduced in 5.2.8) http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_close.c?r1=1.1.2.11&r2=1.1.2.12&diff_format=u Index: php-src/ext/zip/lib/zip_close.c diff -u php-src/ext/zip/lib/zip_close.c:1.1.2.11 php-src/ext/zip/lib/zip_close.c:1.1.2.12 --- php-src/ext/zip/lib/zip_close.c:1.1.2.11 Wed Dec 31 11:17:47 2008 +++ php-src/ext/zip/lib/zip_close.c Thu Jan 1 19:32:24 2009 @@ -636,13 +636,14 @@ char *temp; int tfd; FILE *tfp; + int len = strlen(za->zn) + 8; if ((temp=(char *)malloc(strlen(za->zn)+8)) == NULL) { _zip_error_set(&za->error, ZIP_ER_MEMORY, 0); return NULL; } - sprintf(temp, "%s.XXXXXX", za->zn); + snprintf(temp, len, "%s.XXXXXX", za->zn); if ((tfd=mkstemp(temp)) == -1) { _zip_error_set(&za->error, ZIP_ER_TMPOPEN, errno); @@ -657,6 +658,9 @@ free(temp); return NULL; } +#ifdef PHP_WIN32 + _setmode(_fileno(tfp), _O_BINARY ); +#endif *outp = tfp; return temp;