Updating Smarty

1 files changed, 19 insertions, 10 deletions

diff --git a/lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php b/lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php
index cf35e3c..4383e6f 100644
--- a/lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php
+++ b/lib/smarty3/sysplugins/smarty_internal_runtime_writefile.php
@@ -18,9 +18,9 @@ class Smarty_Internal_Runtime_WriteFile
     /**
      * Writes file in a safe way to disk
      *
-     * @param  string $_filepath complete filepath
-     * @param  string $_contents file content
-     * @param  Smarty $smarty    smarty instance
+     * @param string $_filepath complete filepath
+     * @param string $_contents file content
+     * @param Smarty $smarty    smarty instance
      *
      * @throws SmartyException
      * @return boolean true
@@ -35,20 +35,30 @@ class Smarty_Internal_Runtime_WriteFile
         if ($_file_perms !== null) {
             $old_umask = umask(0);
         }
-
         $_dirpath = dirname($_filepath);
         // if subdirs, create dir structure
-        if ($_dirpath !== '.' && !file_exists($_dirpath)) {
-            mkdir($_dirpath, $_dir_perms, true);
+        if ($_dirpath !== '.') {
+            $i = 0;
+            // loop if concurrency problem occurs
+            // see https://bugs.php.net/bug.php?id=35326
+            while (!is_dir($_dirpath)) {
+                if (@mkdir($_dirpath, $_dir_perms, true)) {
+                    break;
+                }
+                clearstatcache();
+                if (++$i === 3) {
+                    error_reporting($_error_reporting);
+                    throw new SmartyException("unable to create directory {$_dirpath}");
+                }
+                sleep(1);
+            }
         }
-
         // write to tmp file, then move to overt file lock race condition
-        $_tmp_file = $_dirpath . DS . str_replace(array('.', ','), '_', uniqid('wrt', true));
+        $_tmp_file = $_dirpath . DIRECTORY_SEPARATOR . str_replace(array('.', ','), '_', uniqid('wrt', true));
         if (!file_put_contents($_tmp_file, $_contents)) {
             error_reporting($_error_reporting);
             throw new SmartyException("unable to write file {$_tmp_file}");
         }
-
         /*
          * Windows' rename() fails if the destination exists,
          * Linux' rename() properly handles the overwrite.
@@ -85,7 +95,6 @@ class Smarty_Internal_Runtime_WriteFile
             umask($old_umask);
         }
         error_reporting($_error_reporting);
-
         return true;
     }
 }