Ticket #32279: 32279.diff

src/wp-includes/wp-db.php

@@ -2693 +2693 @@
                         }
 
                         // We couldn't use any local conversions, send it to the DB.
                         $value['db'] = $db_check_string = true;
                 }
                 unset( $value ); // Remove by reference.
 
                 if ( $db_check_string ) {
                         $queries = array();
                         foreach ( $data as $col => $value ) {
                                 if ( ! empty( $value['db'] ) ) {
                                         if ( ! isset( $queries[ $value['charset'] ] ) ) {
                                                 $queries[ $value['charset'] ] = array();
                                         }
 
-                                        // We're going to need to truncate by characters or bytes, depending on the length value we have.
-                                        if ( 'byte' === $value['length']['type'] ) {
-                                                // Split the CONVERT() calls by charset, so we can make sure the connection is right
-                                                $queries[ $value['charset'] ][ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING binary ), %d ) USING {$value['charset']} )", $value['value'], $value['length']['length'] );
+                                        if ( is_array( $value['length'] ) ) {
+                                                // We're going to need to truncate by characters or bytes, depending on the length value we have.
+                                                if ( 'byte' === $value['length']['type'] ) {
+                                                        // Split the CONVERT() calls by charset, so we can make sure the connection is right
+                                                        $queries[ $value['charset'] ][ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING binary ), %d ) USING {$value['charset']} )", $value['value'], $value['length']['length'] );
+                                                } else {
+                                                        $queries[ $value['charset'] ][ $col ] = $this->prepare( "LEFT( CONVERT( %s USING {$value['charset']} ), %d )", $value['value'], $value['length']['length'] );
+                                                }
                                         } else {
-                                                $queries[ $value['charset'] ][ $col ] = $this->prepare( "LEFT( CONVERT( %s USING {$value['charset']} ), %d )", $value['value'], $value['length']['length'] );
+                                                $queries[ $value['charset'] ][ $col ] = $this->prepare( "CONVERT( %s USING {$value['charset']} )", $value['value'] );
                                         }
 
                                         unset( $data[ $col ]['db'] );
                                 }
                         }
 
                         $connection_charset = $this->charset;
                         foreach ( $queries as $charset => $query ) {
                                 if ( ! $query ) {
                                         continue;
                                 }
 
                                 // Change the charset to match the string(s) we're converting
                                 if ( $charset !== $connection_charset ) {
                                         $connection_charset = $charset;

tests/phpunit/tests/db/charset.php

@@ -762 +762 @@
 
                 self::$_wpdb->query( $drop );
         }
 
         function test_strip_invalid_text_for_column_bails_if_ascii_input_too_long() {
                 global $wpdb;
 
                 // TEXT column
                 $stripped = $wpdb->strip_invalid_text_for_column( $wpdb->comments, 'comment_content', str_repeat( 'A', 65536 ) );
                 $this->assertEquals( 65535, strlen( $stripped ) );
 
                 // VARCHAR column
                 $stripped = $wpdb->strip_invalid_text_for_column( $wpdb->comments, 'comment_agent', str_repeat( 'A', 256 ) );
                 $this->assertEquals( 255, strlen( $stripped ) );
         }
+
+        /**
+         * @ticket 32279
+         */
+        function test_strip_invalid_text_from_query_cp1251_is_safe() {
+                $tablename = 'test_cp1251_query_' . rand_str( 5 );
+                if ( ! self::$_wpdb->query( "CREATE TABLE $tablename ( a VARCHAR(50) ) DEFAULT CHARSET 'cp1251'" ) ) {
+                        $this->markTestSkipped( "Test requires the 'cp1251' charset" );
+                }
+
+                $safe_query = "INSERT INTO $tablename( `a` ) VALUES( 'safe data' )";
+                $stripped_query = self::$_wpdb->strip_invalid_text_from_query( $safe_query );
+
+                self::$_wpdb->query( "DROP TABLE $tablename" );
+
+                $this->assertEquals( $safe_query, $stripped_query );
+        }
+
 }