Ticket #30613: 30613.2.diff

src/wp-admin/customize.php

@@ -304 +304 @@
                 }
         }
 
+        $settings = wp_json_encode( $settings );
+        // Sanity check to print valid JSON.
+        if ( false === $settings ) {
+                $settings = '[]';
+        }
+
         ?>
         <script type="text/javascript">
-                var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+                var _wpCustomizeSettings = <?php echo $settings; ?>;
         </script>
 </div>
 </body>

src/wp-admin/includes/ajax-actions.php

@@ -289 +289 @@
                 );
         }
 
-        wp_die( wp_json_encode( $return ) );
+        $return = wp_json_encode( $return );
+        // Sanity check to print valid JSON.
+        if ( false === $return ) {
+                $return = '[]';
+        }
+
+        wp_die( $return );
 }
 
 /**
@@ -1375 +1381 @@
 
                 $markup = ob_get_clean();
 
-                echo wp_json_encode(array(
+                $json = wp_json_encode( array(
                         'replace-id' => $type . '-' . $item->name,
                         'markup' => $markup,
-                ));
+                ) );
+                // Sanity check to print valid JSON.
+                if ( false === $json ) {
+                        $json = '[]';
+                }
+
+                echo $json;
         }
 
         wp_die();
@@ -1404 +1416 @@
         if ( ! isset( $results ) )
                 wp_die( 0 );
 
-        echo wp_json_encode( $results );
+        $results = wp_json_encode( $results );
+        // Sanity check to print valid JSON.
+        if ( false === $results ) {
+                $results = '[]';
+        }
+
+        echo $results;
         echo "\n";
 
         wp_die();
@@ -1919 +1937 @@
                 case 'save' :
                         $msg = wp_save_image($attachment_id);
                         $msg = wp_json_encode($msg);
+                        // Sanity check to print valid JSON.
+                        if ( false === $msg ) {
+                                $msg = '{}';
+                        }
                         wp_die( $msg );
                         break;
                 case 'scale' :

src/wp-admin/includes/class-wp-list-table.php

@@ -1106 +1106 @@
                         $response['total_pages_i18n'] = number_format_i18n( $this->_pagination_args['total_pages'] );
                 }
 
-                die( wp_json_encode( $response ) );
+                $response = wp_json_encode( $response );
+                // Sanity check to print valid JSON.
+                if ( false === $response ) {
+                        $response = '[]';
+                }
+
+                die( $response );
         }
 
         /**
@@ -1123 +1129 @@
                         )
                 );
 
-                printf( "<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode( $args ) );
+                $args = wp_json_encode( $args );
+                // Sanity check to print valid JSON.
+                if ( false === $args ) {
+                        $args = '[]';
+                }
+
+                printf( "<script type='text/javascript'>list_args = %s;</script>\n", $args );
         }
 }

src/wp-admin/includes/class-wp-themes-list-table.php

@@ -276 +276 @@
                         'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1,
                 );
 
-                if ( is_array( $extra_args ) )
+                if ( is_array( $extra_args ) ) {
                         $args = array_merge( $args, $extra_args );
+                }
+
+                $args = wp_json_encode( $args );
+                // Sanity check to print valid JSON.
+                if ( false === $args ) {
+                        $args = '[]';
+                }
 
-                printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode( $args ) );
+                printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", $args );
                 parent::_js_vars();
         }
 }

src/wp-admin/includes/media.php

@@ -1829 +1829 @@
 $large_size_w = absint( get_option('large_size_w') );
 if( !$large_size_w )
         $large_size_w = 1024;
+
+$plupload_init = wp_json_encode( $plupload_init );
+// Sanity check to print valid JSON.
+if ( false === $plupload_init ) {
+        $plupload_init = '[]';
+}
 ?>
 var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
-wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
+wpUploaderInit = <?php echo $plupload_init; ?>;
 </script>
 
 <div id="plupload-upload-ui" class="hide-if-no-js">

src/wp-admin/includes/misc.php

@@ -616 +616 @@
                 <?php
                 wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
                 foreach ( $_wp_admin_css_colors as $color => $color_info ) :
-
+                        $icon_colors = wp_json_encode( array( 'icons' => $color_info->icon_colors ) );
+                        // Sanity check to print valid JSON.
+                        if ( false === $icon_colors ) {
+                                $icon_colors = '[]';
+                        }
                         ?>
                         <div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
                                 <input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
                                 <input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />
-                                <input type="hidden" class="icon_colors" value="<?php echo esc_attr( wp_json_encode( array( 'icons' => $color_info->icon_colors ) ) ); ?>" />
+                                <input type="hidden" class="icon_colors" value="<?php echo esc_attr( $icon_colors ); ?>" />
                                 <label for="admin_color_<?php echo esc_attr( $color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
                                 <table class="color-palette">
                                         <tr>
@@ -665 +669 @@
                 $icon_colors = array( 'base' => '#999', 'focus' => '#2ea2cc', 'current' => '#fff' );
         }
 
-        echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
+        $icon_colors = wp_json_encode( array( 'icons' => $icon_colors ) );
+        // Sanity check to print valid JSON.
+        if ( false === $icon_colors ) {
+                $icon_colors = '[]';
+        }
+
+        echo "<script type='text/javascript'>var _wpColorScheme = $icon_colors;</script>\n";
 }
 add_action( 'admin_head', 'wp_color_scheme_settings' );
 

src/wp-admin/includes/nav-menu.php

@@ -356 +356 @@
                                 if ( 'markup' == $response_format ) {
                                         echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
                                 } elseif ( 'json' == $response_format ) {
-                                        echo wp_json_encode(
+                                        $json = wp_json_encode(
                                                 array(
                                                         'ID' => $object_id,
                                                         'post_title' => get_the_title( $object_id ),
                                                         'post_type' => get_post_type( $object_id ),
                                                 )
                                         );
-                                        echo "\n";
+                                        // Sanity check to print valid JSON.
+                                        if ( false === $json ) {
+                                                $json = '[]';
+                                        }
+
+                                        echo "$json\n";
                                 }
                         }
                 } elseif ( taxonomy_exists( $object_type ) ) {
@@ -373 +378 @@
                                         echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
                                 } elseif ( 'json' == $response_format ) {
                                         $post_obj = get_term( $object_id, $object_type );
-                                        echo wp_json_encode(
+                                        $json = wp_json_encode(
                                                 array(
                                                         'ID' => $object_id,
                                                         'post_title' => $post_obj->name,
                                                         'post_type' => $object_type,
                                                 )
                                         );
-                                        echo "\n";
+                                        // Sanity check to print valid JSON.
+                                        if ( false === $json ) {
+                                                $json = '[]';
+                                        }
+
+                                        echo "$json\n";
                                 }
                         }
 
@@ -401 +411 @@
                                         $var_by_ref = get_the_ID();
                                         echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
                                 } elseif ( 'json' == $response_format ) {
-                                        echo wp_json_encode(
+                                        $json = wp_json_encode(
                                                 array(
                                                         'ID' => get_the_ID(),
                                                         'post_title' => get_the_title(),
                                                         'post_type' => get_post_type(),
                                                 )
                                         );
-                                        echo "\n";
+                                        // Sanity check to print valid JSON.
+                                        if ( false === $json ) {
+                                                $json = '[]';
+                                        }
+
+                                        echo "$json\n";
                                 }
                         }
                 } elseif ( 'taxonomy' == $matches[1] ) {
@@ -422 +437 @@
                                 if ( 'markup' == $response_format ) {
                                         echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
                                 } elseif ( 'json' == $response_format ) {
-                                        echo wp_json_encode(
+                                        $json = wp_json_encode(
                                                 array(
                                                         'ID' => $term->term_id,
                                                         'post_title' => $term->name,
                                                         'post_type' => $matches[2],
                                                 )
                                         );
-                                        echo "\n";
+                                        // Sanity check to print valid JSON.
+                                        if ( false === $json ) {
+                                                $json = '[]';
+                                        }
+
+                                        echo "$json\n";
                                 }
                         }
                 }

src/wp-admin/includes/template.php

@@ -1960 +1960 @@
          * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
          */
         private static function print_js( $pointer_id, $selector, $args ) {
-                if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
+                if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) ) {
                         return;
+                }
+
+                $options = wp_json_encode( $args );
+                // Sanity check to print valid JSON.
+                if ( false === $options ) {
+                        $options = 'false';
+                }
 
                 ?>
                 <script type="text/javascript">
                 (function($){
-                        var options = <?php echo wp_json_encode( $args ); ?>, setup;
+                        var options = <?php echo $options; ?>, setup;
 
-                        if ( ! options )
+                        if ( ! options ) {
                                 return;
+                        }
 
                         options = $.extend( options, {
                                 close: function() {
@@ -1984 +1992 @@
                                 $('<?php echo $selector; ?>').first().pointer( options ).pointer('open');
                         };
 
-                        if ( options.position && options.position.defer_loading )
+                        if ( options.position && options.position.defer_loading ) {
                                 $(window).bind( 'load.wp-pointers', setup );
-                        else
+                        } else {
                                 $(document).ready( setup );
+                        }
 
                 })( jQuery );
                 </script>

src/wp-admin/options-general.php

@@ -26 +26 @@
  * @since 3.5.0
  */
 function options_general_add_js() {
+        $home_url = wp_json_encode( get_home_url() );
+        // Sanity check to print valid JSON.
+        if ( false === $home_url ) {
+                $home_url = "''";
+        }
 ?>
 <script type="text/javascript">
         jQuery(document).ready(function($){
                 var $siteName = $( '#wp-admin-bar-site-name' ).children( 'a' ).first(),
-                        homeURL = ( <?php echo wp_json_encode( get_home_url() ); ?> || '' ).replace( /^(https?:\/\/)?(www\.)?/, '' );
+                        homeURL = ( <?php echo $home_url; ?> || '' ).replace( /^(https?:\/\/)?(www\.)?/, '' );
 
                 $( '#blogname' ).on( 'input', function() {
                         var title = $.trim( $( this ).val() ) || homeURL;

src/wp-includes/class-wp-customize-manager.php

@@ -550 +550 @@
                         $settings['activeControls'][ $id ] = $control->active();
                 }
 
+                $settings = wp_json_encode( $settings );
+                // Sanity check to print valid JSON.
+                if ( false === $settings ) {
+                        $settings = '[]';
+                }
+
                 ?>
                 <script type="text/javascript">
-                        var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+                        var _wpCustomizeSettings = <?php echo $settings; ?>;
                 </script>
                 <?php
         }

src/wp-includes/class-wp-customize-widgets.php

@@ -741 +741 @@
                         unset( $registered_widget['callback'] ); // may not be JSON-serializeable
                 }
 
+                $settings = wp_json_encode( $settings );
+                // Sanity check to print valid JSON.
+                if ( false === $settings ) {
+                        $settings = '[]';
+                }
+
                 $wp_scripts->add_data(
                         'customize-widgets',
                         'data',
-                        sprintf( 'var _wpCustomizeWidgetsSettings = %s;', wp_json_encode( $settings ) )
+                        sprintf( 'var _wpCustomizeWidgetsSettings = %s;', $settings )
                 );
         }
 
@@ -1057 +1063 @@
                         unset( $registered_widget['callback'] ); // may not be JSON-serializeable
                 }
 
+                $settings = wp_json_encode( $settings );
+                // Sanity check to print valid JSON.
+                if ( false === $settings ) {
+                        $settings = '[]';
+                }
+
                 ?>
                 <script type="text/javascript">
-                        var _wpWidgetCustomizerPreviewSettings = <?php echo wp_json_encode( $settings ); ?>;
+                        var _wpWidgetCustomizerPreviewSettings = <?php echo $settings; ?>;
                 </script>
                 <?php
         }

src/wp-includes/class-wp-editor.php

@@ -519 +519 @@
                                 );
 
                                 if ( ! empty( $mce_external_plugins ) ) {
-                                        self::$first_init['external_plugins'] = wp_json_encode( $mce_external_plugins );
+                                        $mce_external_plugins_json = wp_json_encode( $mce_external_plugins );
+                                        // Sanity check to print valid JSON.
+                                        if ( false === $mce_external_plugins_json ) {
+                                                $mce_external_plugins_json = '[]';
+                                        }
+
+                                        self::$first_init['external_plugins'] = $mce_external_plugins_json;
                                 }
 
                                 $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
@@ -1044 +1050 @@
                         $mce_translation['_dir'] = 'rtl';
                 }
 
+                $mce_translation = wp_json_encode( $mce_translation );
+                // Sanity check to print valid JSON.
+                if ( false === $mce_translation ) {
+                        $mce_translation = '[]';
+                }
+
                 if ( $json_only ) {
-                        return wp_json_encode( $mce_translation );
+                        return $mce_translation;
                 }
 
                 $baseurl = self::$baseurl ? self::$baseurl : includes_url( 'js/tinymce' );
 
-                return "tinymce.addI18n( '$mce_locale', " . wp_json_encode( $mce_translation ) . ");\n" .
+                return "tinymce.addI18n( '$mce_locale', $mce_translation );\n" .
                         "tinymce.ScriptLoader.markDone( '$baseurl/langs/$mce_locale.js' );\n";
         }
 

src/wp-includes/class.wp-scripts.php

@@ -208 +208 @@
                         $l10n[$key] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8');
                 }
 
-                $script = "var $object_name = " . wp_json_encode( $l10n ) . ';';
+                $json = wp_json_encode( $l10n );
+                // Sanity check to print valid JSON.
+                if ( false === $json ) {
+                        $json = '[]';
+                }
+
+                $script = "var $object_name = $json;";
 
                 if ( !empty($after) )
                         $script .= "\n$after;";

src/wp-includes/functions.php

@@ -2784 +2784 @@
  */
 function wp_send_json( $response ) {
         @header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
-        echo wp_json_encode( $response );
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+
+        $json = wp_json_encode( $response );
+        // Sanity check to print valid JSON.
+        if ( false === $json ) {
+                $json = 'false';
+        }
+
+        echo $json;
+
+        if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
                 wp_die();
-        else
+        } else {
                 die;
+        }
 }
 
 /**

src/wp-includes/media.php

@@ -1365 +1365 @@
         $safe_type = esc_attr( $atts['type'] );
         $safe_style = esc_attr( $atts['style'] );
 
+        $data_json = wp_json_encode( $data );
+        // Sanity check to print valid JSON.
+        if ( false === $data_json ) {
+                $data_json = '[]';
+        }
+
         ob_start();
 
         if ( 1 === $instance ) {
@@ -1398 +1404 @@
         }
         ?></ol>
         </noscript>
-        <script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode( $data ) ?></script>
+        <script type="application/json" class="wp-playlist-script"><?php echo $data_json; ?></script>
 </div>
         <?php
         return ob_get_clean();
@@ -2591 +2597 @@
                 'limitExceeded' => is_multisite() && ! is_upload_space_available()
         );
 
-        $script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
+        $settings = wp_json_encode( $settings );
+        // Sanity check to print valid JSON.
+        if ( false === $settings ) {
+                $settings = '[]';
+        }
+
+        $script = "var _wpPluploadSettings = $settings;";
 
         if ( $data )
                 $script = "$data\n$script";

src/wp-includes/theme.php

@@ -1964 +1964 @@
                 ),
         );
 
-        $script = 'var _wpCustomizeLoaderSettings = ' . wp_json_encode( $settings ) . ';';
+        $settings = wp_json_encode( $settings );
+        // Sanity check to print valid JSON.
+        if ( false === $settings ) {
+                $settings = '[]';
+        }
+        $script = "var _wpCustomizeLoaderSettings = $settings;";
 
         $data = $wp_scripts->get_data( 'customize-loader', 'data' );
         if ( $data )

src/wp-includes/update.php

@@ -93 +93 @@
                 'multisite_enabled' => $multisite_enabled,
         );
 
+        $json = wp_json_encode( $translations );
+        // Sanity check to print valid JSON.
+        if ( false === $json ) {
+                $json = '[]';
+        }
+
         $post_body = array(
-                'translations' => wp_json_encode( $translations ),
+                'translations' => $json,
         );
 
         if ( is_array( $extra_stats ) )
@@ -277 +283 @@
                         'plugins'      => wp_json_encode( $to_send ),
                         'translations' => wp_json_encode( $translations ),
                         'locale'       => wp_json_encode( $locales ),
-                        'all'          => wp_json_encode( true ),
+                        'all'          => 'true', // JSON-encoded true.
                 ),
                 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
         );
@@ -286 +292 @@
                 $options['body']['update_stats'] = wp_json_encode( $extra_stats );
         }
 
+        // Make sure wp_json_encode() was able to encode everything.
+        foreach ( $options['body'] as &$item ) {
+                if ( false === $item ) {
+                        $item = '[]';
+                }
+        }
+        unset( $item );
+
         $url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
         if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
                 $url = set_url_scheme( $url, 'https' );
@@ -448 +462 @@
                 $options['body']['update_stats'] = wp_json_encode( $extra_stats );
         }
 
+        // Make sure wp_json_encode() was able to encode everything.
+        foreach ( $options['body'] as &$item ) {
+                if ( false === $item ) {
+                        $item = '[]';
+                }
+        }
+        unset( $item );
+
         $url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
         if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
                 $url = set_url_scheme( $url, 'https' );