mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-03 23:05:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix occasional fail in zip_close when target arc exists

Browse Source
This commit is contained in:
Anatol Belski 2015-08-19 15:19:44 +02:00
parent c97427ea8e
commit ed78d59a1d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/zip/lib/zip_source_filep.c
View File

@ -43,6 +43,7 @@
#ifdef _WIN32
/* WIN32 needs <fcntl.h> for _O_BINARY */
#include <fcntl.h>
#include <windows.h>
#endif
/* Windows sys/types.h does not provide these */
@ -248,10 +249,17 @@ read_file(void *state, void *data, zip_uint64_t len, zip_source_cmd_t cmd)
zip_error_set(&ctx->error, ZIP_ER_WRITE, errno);
}
ctx->fout = NULL;
#ifdef _WIN32
if (!MoveFileEx(ctx->tmpname, ctx->fname, MOVEFILE_REPLACE_EXISTING)) {
zip_error_set(&ctx->error, ZIP_ER_RENAME, GetLastError());
return -1;
}
#else
if (rename(ctx->tmpname, ctx->fname) < 0) {
zip_error_set(&ctx->error, ZIP_ER_RENAME, errno);
return -1;
}
#endif
mask = umask(022);
umask(mask);
/* not much we can do if chmod fails except make the whole commit fail */