Changeset 3797

Timestamp:

05/26/2006 09:09:06 PM (20 years ago)

Author:

ryan

Message:

base64 cached objects and store within multi-line comment block to avoid CRLF injections into the cache. Props Peter Westwood.

Location:

branches/2.0

Files:

• wp-admin/upgrade.php (modified) (1 diff)
• wp-includes/cache.php (modified) (4 diffs)
• wp-includes/version.php (modified) (1 diff)

branches/2.0/wp-admin/upgrade.php

@@ -77 +77 @@
     case 1:
     $wp_current_db_version = __get_option('db_version');
-    if ( $wp_db_version < $wp_current_db_version ) {
+    if ( $wp_db_version != $wp_current_db_version ) {
         wp_cache_flush();
         make_db_current_silent();

branches/2.0/wp-includes/cache.php

@@ -48 +48 @@
 }
 
-define('CACHE_SERIAL_HEADER', "<?php\n//");
-define('CACHE_SERIAL_FOOTER', "\n?".">");
+define('CACHE_SERIAL_HEADER', "<?php\n/*");
+define('CACHE_SERIAL_FOOTER', "*/\n?".">");
 
 class WP_Object_Cache {
@@ -104 +104 @@
         if ( ! $this->acquire_lock() )
             return false;
-        
+
         $this->rm_cache_dir();
         $this->cache = array ();
@@ -159 +159 @@
         }
 
-        $this->cache[$group][$id] = unserialize(substr(@ file_get_contents($cache_file), strlen(CACHE_SERIAL_HEADER), -strlen(CACHE_SERIAL_FOOTER)));
+        $this->cache[$group][$id] = unserialize(base64_decode(substr(@ file_get_contents($cache_file), strlen(CACHE_SERIAL_HEADER), -strlen(CACHE_SERIAL_FOOTER))));
         if (false === $this->cache[$group][$id])
             $this->cache[$group][$id] = '';
@@ -343 +343 @@
 
                 $temp_file = tempnam($group_dir, 'tmp');
-                $serial = CACHE_SERIAL_HEADER.serialize($this->cache[$group][$id]).CACHE_SERIAL_FOOTER;
+                $serial = CACHE_SERIAL_HEADER.base64_encode(serialize($this->cache[$group][$id])).CACHE_SERIAL_FOOTER;
                 $fd = @fopen($temp_file, 'w');
                 if ( false === $fd ) {

branches/2.0/wp-includes/version.php

@@ -4 +4 @@
 
 $wp_version = '2.0.3-beta';
-$wp_db_version = 3437;
+$wp_db_version = 3796;
 
 ?>