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;
on 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=25c4a04fded1bc129df6af5fa563771194ebd7a1'>root</a>/<a href='/guix/log/.gitignore?id=25c4a04fded1bc129df6af5fa563771194ebd7a1'>.gitignore</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/.gitignore?id=25c4a04fded1bc129df6af5fa563771194ebd7a1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-18 11:38:14 +0200'>2019-09-18</span></td><td><a href='/guix/commit/.gitignore?id=7bc46ecc34ceb042ff890e5d306d0a2a736e891d'>doc: Add Guix Cookbook.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-04-26 11:21:32 +0200'>2019-04-26</span></td><td><a href='/guix/commit/.gitignore?id=9ca5ff882e2ac4eaab02eb0fde545bd784af478b'>bootstrap: Break automake dependency on generated files.</a><span class='msg-avail'>...</span></td><td>Miguel Ángel Arruga Vivas</td></tr>
<tr><td><span title='2018-11-20 01:42:43 +0100'>2018-11-20</span></td><td><a href='/guix/commit/.gitignore?id=975b7966f592993bce04e3c153f52f2ece402f21'>.gitignore: Re-add 'authenticate' script.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-06-14 11:17:00 +0200'>2018-06-14</span></td><td><a href='/guix/commit/.gitignore?id=ea0a06cee2ba05451f94714a4f913db02efbe92c'>Remove 'guix-register' and its traces.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-12 15:23:34 +0200'>2018-06-12</span></td><td><a href='/guix/commit/.gitignore?id=5909bdc88735c2c1bd9f44eb6a1b518785144292'>.gitignore: Add doc/stamp-[0-9].</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-04-19 21:30:30 +0200'>2018-04-19</span></td><td><a href='/guix/commit/.gitignore?id=b9fe8fd662180e64156d2b95a671242c20f0acfc'>gnu: doc: Allow documentation to be translated.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2018-02-13 22:56:49 +0200'>2018-02-13</span></td><td><a href='/guix/commit/.gitignore?id=99f696324271992eb78874f1b697102db6968625'>.gitignore: Add guix-daemon SELinux policy.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2017-05-13 12:14:28 +0300'>2017-05-13</span></td><td><a href='/guix/commit/.gitignore?id=498abb3ed1d7dcda3ffac15832eb1e25d08e9162'>.gitignore: Ignore Emacs auto-save files.</a><span class='msg-avail'>...</span></td><td>ng0</td></tr>
<tr><td><span title='2017-05-08 20:08:23 +0200'>2017-05-08</span></td><td><a href='/guix/commit/.gitignore?id=65584b91c7029e93e6fd207f08c958206f1dcfc5'>build: Add doc/guix.html to .gitignore.</a><span class='msg-avail'>...</span></td><td>Clément Lassieur</td></tr>
<tr><td><span title='2017-05-04 23:51:45 +0200'>2017-05-04</span></td><td><a href='/guix/commit/.gitignore?id=e6860b5e7f8ded96c1769dcff27dffb97587e3e2'>build: Use Gnulib's 'git-version-gen'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>