Handle last or broken JP2 boxes correctly.

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 07f13f8048d2d6617e9631d65c6366b6fd3ea512..a049284dfb3c8fe136f7f261ae6e06dbb91c8bae 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -708,6 +708,11 @@ static struct gfxinfo *php_handle_jp2(php_stream *stream TSRMLS_DC)
                        break;
                }
 
+               /* Stop if this was the last box */
+               if ((int)box_length <= 0) {
+                       break;
+               }
+
                /* Skip over LBox (Which includes both TBox and LBox itself */
                if (php_stream_seek(stream, box_length - 8, SEEK_CUR)) {
                        break;