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;
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=a44cd79545cd520c5bd0bcc0c399bb83709fe891'>root</a>/<a href='/guix/log/gnu?id=a44cd79545cd520c5bd0bcc0c399bb83709fe891'>gnu</a>/<a href='/guix/log/gnu/packages.scm?id=a44cd79545cd520c5bd0bcc0c399bb83709fe891'>packages.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/gnu/packages.scm?id=a44cd79545cd520c5bd0bcc0c399bb83709fe891&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-25 18:14:42 +0100'>2023-01-25</span></td><td><a href='/guix/commit/gnu/packages.scm?id=8b2721de6af76780611fe9f86fa5d4cd062400d1'>packages: Adjust 'generate-package-cache' for Guile 3.0.9.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-06 22:43:30 +0200'>2022-06-06</span></td><td><a href='/guix/commit/gnu/packages.scm?id=635d49f97ee233bbb2673f97d7556c3c91b55889'>packages: Use SRFI-71 instead of SRFI-11.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-06-06 22:43:30 +0200'>2022-06-06</span></td><td><a href='/guix/commit/gnu/packages.scm?id=7041fe0646a9603e7d1d6bde139a284146515917'>packages: Add 'specifications-&gt;packages'.</a><span class='msg-avail'>...</span></td><td>Antero Mejr</td></tr>
<tr><td><span title='2022-04-04 22:58:03 +0200'>2022-04-04</span></td><td><a href='/guix/commit/gnu/packages.scm?id=f54f2aa9df5047b348ca104f5145af50c1a482f6'>packages: Add 'package-unique-version-prefix'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-11 20:34:59 +0100'>2022-01-11</span></td><td><a href='/guix/commit/gnu/packages.scm?id=0552dcb294bbfed76d7a495f5e368c53f20b852a'>shell: Cache profiles even when using package specs.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>