Fixed bug #43182 (file_put_contents() LOCK_EX does not work properly on file

truncation).

diff --git a/ext/standard/file.c b/ext/standard/file.c
index b55fd49b5bb87dd710ca0facea31c70946febfeb..45c31c72013ab207a487dde83c06180880c101a0 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -581,6 +581,7 @@ PHP_FUNCTION(file_put_contents)
        zval *zcontext = NULL;
        php_stream_context *context = NULL;
        php_stream *srcstream = NULL;
+       char mode[3] = "wb";
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/|lr!", &filename, &filename_len, &data, &flags, &zcontext) == FAILURE) {
                return;
@@ -592,8 +593,14 @@ PHP_FUNCTION(file_put_contents)
 
        context = php_stream_context_from_zval(zcontext, flags & PHP_FILE_NO_DEFAULT_CONTEXT);
 
-       stream = php_stream_open_wrapper_ex(filename, (flags & PHP_FILE_APPEND) ? "ab" : "wb",
-                       ((flags & PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+       if (flags & PHP_FILE_APPEND) {
+               mode[0] = 'a';
+       } else if (flags & LOCK_EX) {
+               mode[0] = 'c';
+       }
+       mode[2] = '\0';
+
+       stream = php_stream_open_wrapper_ex(filename, mode, ((flags & PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
        if (stream == NULL) {
                RETURN_FALSE;
        }
@@ -603,6 +610,10 @@ PHP_FUNCTION(file_put_contents)
                RETURN_FALSE;
        }
 
+       if (mode[0] = 'c') {
+               php_stream_truncate_set_size(stream, 0);
+       }
+
        switch (Z_TYPE_P(data)) {
                case IS_RESOURCE:
                        numbytes = php_stream_copy_to_stream(srcstream, stream, PHP_STREAM_COPY_ALL);

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 0b801b473b50b299efd152d407d5664e30fcca21..20cee917371745fd0c5bcb8ef7d27e2249845143 100644 (file)
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -63,6 +63,9 @@ PHPAPI int php_stream_parse_fopen_modes(const char *mode, int *open_flags)
                case 'x':
                        flags = O_CREAT|O_EXCL;
                        break;
+               case 'c':
+                       flags = O_CREAT;
+                       break;
                default:
                        /* unknown mode */
                        return FAILURE;