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;
a33d518e24b305c7b0f81887c15eeabb65ec9411'/><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=a33d518e24b305c7b0f81887c15eeabb65ec9411'>root</a>/<a href='/guix/log/nix?id=a33d518e24b305c7b0f81887c15eeabb65ec9411'>nix</a>/<a href='/guix/log/nix/libstore?id=a33d518e24b305c7b0f81887c15eeabb65ec9411'>libstore</a>/<a href='/guix/log/nix/libstore/store-api.hh?id=a33d518e24b305c7b0f81887c15eeabb65ec9411'>store-api.hh</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/nix/libstore/store-api.hh?id=a33d518e24b305c7b0f81887c15eeabb65ec9411&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-10-28 22:30:17 +0200'>2016-10-28</span></td><td><a href='/guix/commit/nix/libstore/store-api.hh?id=b1fd0ab73425e682a0a1404da6963f47a033bb34'>daemon: Improve the SQLite wrapper API.</a><span class='msg-avail'>...</span></td><td>Eelco Dolstra</td></tr>
00'>2019-07-12</span></td><td><a href='/guix/commit/gnu/packages/time.scm?id=fb9a23a3f3ad3d7b5b7f03b2007baf27684d6bbd'>Merge branch 'master' into core-updates</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-07-10 00:55:42 +0200'>2019-07-10</span></td><td><a href='/guix/commit/gnu/packages/time.scm?id=7a05fdd0e1d5e5e26e94014d87bf85575bbec780'>Merge branch 'master' into staging</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-07-07 15:48:19 +0200'>2019-07-07</span></td><td><a href='/guix/commit/gnu/packages/time.scm?id=0d5b7ea11f4b46197ede74e4b203244620dfd0f2'>gnu: Add python-pytimeparse.</a><span class='msg-avail'>...</span></td><td>Pierre Langlois</td></tr>
<tr><td><span title='2019-06-20 23:38:56 +0200'>2019-06-20</span></td><td><a href='/guix/commit/gnu/packages/time.scm?id=6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09'>Merge branch 'staging' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-06-18 15:48:36 +0200'>2019-06-18</span></td><td><a href='/guix/commit/gnu/packages/time.scm?id=71c08ee60bb3f62bac0614888fb62405f7a388ab'>gnu: python-pytz: Update to 2019.1.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>