Changeset 789 for trunk

Timestamp:

Mar 25, 2023 6:30:53 AM (14 months ago)

Author:

anonymous

Message:

Fix potential bug when writing binary data with filePutContents

File:

• trunk/lib/Utilities.inc.php (modified) (4 diffs)

trunk/lib/Utilities.inc.php

@@ -122 +122 @@
 * @author   Quinn Comendant <quinn@strangecode.com>
 */
-function getDump($var, $serialize=false, $dump_method=SC_DUMP_PRINT_R)
+function getDump($var, $serialize=false, $dump_method=SC_DUMP_JSON)
 {
     $app =& App::getInstance();
@@ -128 +128 @@
     switch ($dump_method) {
     case SC_DUMP_PRINT_R:
-    default:
         // Print human-readable descriptions of invisible types.
         if (null === $var) {
@@ -163 +162 @@
 
     case SC_DUMP_JSON:
+    default:
         $json_flags = $serialize ? 0 : JSON_PRETTY_PRINT;
         return json_encode($var, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_NUMERIC_CHECK | $json_flags);
@@ -890 +890 @@
     $app =& App::getInstance();
 
+    if (is_null($content) || is_bool($content) || is_object($content) || is_array($content)) {
+        $app->logMsg(sprintf("Failed writing to file '%s'. Content is not a string.", $filename), LOG_WARNING, __FILE__, __LINE__);
+        return false;
+    }
+
     // Open file for writing and truncate to zero length.
     if ($fp = fopen($filename, 'w')) {
         if (flock($fp, LOCK_EX)) {
-            if (!fwrite($fp, $content, mb_strlen($content))) {
+            if (!fwrite($fp, (string)$content)) {
                 $app->logMsg(sprintf('Failed writing to file: %s', $filename), LOG_ERR, __FILE__, __LINE__);
                 fclose($fp);