Ticket #15058: validate-option-length.diff

wp-includes/default-constants.php

@@ -56 +56 @@
         if ( !defined('WP_CACHE') )
                 define('WP_CACHE', false);
 
+        if ( !defined('WP_OPTION_LENGTH') )
+                define('WP_OPTION_LENGTH', 64);
+
         /**
          * Private
          */

wp-includes/functions.php

@@ -486 +486 @@
  * @return bool False if value was not updated and true if value was updated.
  */
 function update_option( $option, $newvalue ) {
+        if ( strlen($option) > WP_OPTION_LENGTH ) {
+                trigger_error( sprintf( __('update_option: Option name %1$s is longer than the maximum allowed length of %2$s.'), $option, WP_OPTION_LENGTH ), E_USER_WARNING );
+                return false;
+        }
+
         global $wpdb;
 
         $option = trim($option);
@@ -566 +571 @@
  * @return null returns when finished.
  */
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
+        if ( strlen($option) > WP_OPTION_LENGTH ) {
+                trigger_error( sprintf( __('add_option: Option name %1$s is longer than the maximum allowed length of %2$s.'), $option, WP_OPTION_LENGTH ), E_USER_WARNING );
+                return false;
+        }
+
         global $wpdb;
 
         if ( !empty( $deprecated ) )
@@ -633 +643 @@
  * @return bool True, if option is successfully deleted. False on failure.
  */
 function delete_option( $option ) {
+        if ( strlen($option) > WP_OPTION_LENGTH ) {
+                trigger_error( sprintf( __('delete_option: Option name %1$s is longer than the maximum allowed length of %2$s.'), $option, WP_OPTION_LENGTH ), E_USER_WARNING );
+                return false;
+        }
+
         global $wpdb;
 
         wp_protect_special_option( $option );
@@ -676 +691 @@
  * @return bool true if successful, false otherwise
  */
 function delete_transient( $transient ) {
+        if ( strlen('_transient_timeout_' . $transient) > WP_OPTION_LENGTH ) {
+                trigger_error( sprintf( __('delete_transient: Transient name %1$s is longer than the maximum allowed length of %2$s.'), $transient, (WP_OPTION_LENGTH - strlen('_transient_timeout_')) ), E_USER_WARNING );
+                return false;
+        }
+
         global $_wp_using_ext_object_cache;
 
         do_action( 'delete_transient_' . $transient, $transient );
@@ -715 +735 @@
  * @return mixed Value of transient
  */
 function get_transient( $transient ) {
+        if ( strlen('_transient_timeout_' . $transient) > WP_OPTION_LENGTH ) {
+                trigger_error( sprintf( __('get_transient: Transient name %1$s is longer than the maximum allowed length of %2$s.'), $transient, (WP_OPTION_LENGTH - strlen('_transient_timeout_')) ), E_USER_WARNING );
+                return false;
+        }
+
         global $_wp_using_ext_object_cache;
 
         $pre = apply_filters( 'pre_transient_' . $transient, false );
@@ -764 +789 @@
  * @return bool False if value was not set and true if value was set.
  */
 function set_transient( $transient, $value, $expiration = 0 ) {
+        if ( strlen('_transient_timeout_' . $transient) > WP_OPTION_LENGTH ) {
+                trigger_error( sprintf( __('set_transient: Transient name %1$s is longer than the maximum allowed length of %2$s.'), $transient, (WP_OPTION_LENGTH - strlen('_transient_timeout_')) ), E_USER_WARNING );
+                return false;
+        }
+
         global $_wp_using_ext_object_cache;
 
         $value = apply_filters( 'pre_set_transient_' . $transient, $value );