Changeset 49751 for trunk/src/wp-includes/class-wp-image-editor-gd.php

Timestamp:

12/04/2020 09:39:30 PM (4 years ago)

Author:

iandunn

Message:

Media: Return WP_Error when cropping with bad input to avoid fatal.

This avoids an error on PHP 8 caused by calling wp_imagecreatetruecolor() with inputs that aren't numeric, or are less than 0.

Props hellofromtonya, Boniu91, metalandcoffee, SergeyBiryukov.
Fixes #51937.

File:

• trunk/src/wp-includes/class-wp-image-editor-gd.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-image-editor-gd.php

@@ -324 +324 @@
         }
 
-        $dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
+        foreach ( array( $src_w, $src_h, $dst_w, $dst_h ) as $value ) {
+            if ( ! is_numeric( $value ) || (int) $value <= 0 ) {
+                return new WP_Error( 'image_crop_error', __( 'Image crop failed.' ), $this->file );
+            }
+        }
+
+        $dst = wp_imagecreatetruecolor( (int) $dst_w, (int) $dst_h );
 
         if ( $src_abs ) {
@@ -335 +341 @@
         }
 
-        imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
+        imagecopyresampled( $dst, $this->image, 0, 0, (int) $src_x, (int) $src_y, (int) $dst_w, (int) $dst_h, (int) $src_w, (int) $src_h );
 
         if ( is_gd_image( $dst ) ) {