Patch contents copied from Mozilla esr45 changeset 312077:7ebfe49f001c

  changeset:   312077:7ebfe49f001c
  user:        Randell Jesup <rjesup@jesup.org>
  Date:        Fri Apr 15 23:11:01 2016 -0400
  summary:     Bug 1263384: validate input frames against configured resolution in vp8 r=rillian, a=ritu,lizzard

  MozReview-Commit-ID: BxDCnJe0mzs

--- libvpx-1.5.0/vp8/vp8_cx_iface.c.orig	2015-11-09 17:12:38.000000000 -0500
+++ libvpx-1.5.0/vp8/vp8_cx_iface.c	2016-06-08 08:48:46.037213092 -0400
@@ -860,11 +860,20 @@
     if (img != NULL) {
       res = image2yuvconfig(img, &sd);
 
-      if (vp8_receive_raw_frame(ctx->cpi, ctx->next_frame_flag | lib_flags, &sd,
-                                dst_time_stamp, dst_end_time_stamp)) {
-        VP8_COMP *cpi = (VP8_COMP *)ctx->cpi;
-        res = update_error_state(ctx, &cpi->common.error);
-      }
+            if (sd.y_width != ctx->cfg.g_w || sd.y_height != ctx->cfg.g_h) {
+                /* from vp8_encoder.h for g_w/g_h:
+                   "Note that the frames passed as input to the encoder must have this resolution"
+                */
+                ctx->base.err_detail = "Invalid input frame resolution";
+                res = VPX_CODEC_INVALID_PARAM;
+            } else {
+                if (vp8_receive_raw_frame(ctx->cpi, ctx->next_frame_flag | lib_flags,
+                                          &sd, dst_time_stamp, dst_end_time_stamp))
+                {
+                    VP8_COMP *cpi = (VP8_COMP *)ctx->cpi;
+                    res = update_error_state(ctx, &cpi->common.error);
+                }
+            }
 
       /* reset for next frame */
       ctx->next_frame_flag = 0;
18b3c'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=ecabd344c9a2d85751c0d81374d75c64a3c18b3c'>root</a>/<a href='/guix/log/tests?id=ecabd344c9a2d85751c0d81374d75c64a3c18b3c'>tests</a>/<a href='/guix/log/tests/read-print.scm?id=ecabd344c9a2d85751c0d81374d75c64a3c18b3c'>read-print.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/read-print.scm?id=ecabd344c9a2d85751c0d81374d75c64a3c18b3c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-20 19:24:31 +0200'>2022-09-20</span></td><td><a href='/guix/commit/tests/read-print.scm?id=7a698da0d04d75f1c49f9ae9f358070acab0f781'>read-print: Correctly support multiple same-named newline forms.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-09-02 10:49:35 +0200'>2022-09-02</span></td><td><a href='/guix/commit/tests/read-print.scm?id=82968362ead0ed59c64ee8a21fec346c9265a149'>read-print: Define forms for which \n, \t, etc. are not escaped.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-09-01 18:31:26 +0200'>2022-09-01</span></td><td><a href='/guix/commit/tests/read-print.scm?id=c3b1cfe76b7038f4030d7d207ffc417fed9a7ead'>read-print: Guess the base to use for integers being printed.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-10 16:53:58 +0200'>2022-08-10</span></td><td><a href='/guix/commit/tests/read-print.scm?id=ebda12e1d2c64480bb7d5977e580d8b2eabeb503'>read-print: Report missing closing parens instead of looping.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-08 11:54:25 +0200'>2022-08-08</span></td><td><a href='/guix/commit/tests/read-print.scm?id=6db3b34d7203639ef4286c237a6e536259f92352'>read-print: Add 'case' and 'cond' special forms.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-08 11:54:24 +0200'>2022-08-08</span></td><td><a href='/guix/commit/tests/read-print.scm?id=445a0d134ce735577d1e22f210c2e5ceafc56762'>read-print: Support printing multi-line comments.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-08 11:22:32 +0200'>2022-08-08</span></td><td><a href='/guix/commit/tests/read-print.scm?id=90ef692e9b48732ae2e3921ff5d101e186506a85'>read-print: 'canonicalize-comment' leaves top-level comments unchanged.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-08 11:22:32 +0200'>2022-08-08</span></td><td><a href='/guix/commit/tests/read-print.scm?id=9b00c97de41165beefe3eff936470f8e081ca600'>read-print: Add code to read and write sequences of expressions/blanks.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-08 11:22:32 +0200'>2022-08-08</span></td><td><a href='/guix/commit/tests/read-print.scm?id=077324a16fd6c7d2307bfa52a9863ca25cfc6a52'>read-print: Recognize page breaks.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-08 11:22:32 +0200'>2022-08-08</span></td><td><a href='/guix/commit/tests/read-print.scm?id=f687e27e0385c7f9bab8d967293061158fc3f504'>read-print: Read and render vertical space.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-08-08 11:22:31 +0200'>2022-08-08</span></td><td><a href='/guix/commit/tests/read-print.scm?id=5817e222faf46f76fbdb66ba8fd6c8cd643aefb5'>style: Move reader and printer to (guix read-print).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>