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;
f31f7'/><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=f45bb3cc0fc4e687f966a8f2fabce73e0c6f31f7'>root</a>/<a href='/guix/log/gnu?id=f45bb3cc0fc4e687f966a8f2fabce73e0c6f31f7'>gnu</a>/<a href='/guix/log/gnu/packages?id=f45bb3cc0fc4e687f966a8f2fabce73e0c6f31f7'>packages</a>/<a href='/guix/log/gnu/packages/vpn.scm?id=f45bb3cc0fc4e687f966a8f2fabce73e0c6f31f7'>vpn.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/vpn.scm?id=f45bb3cc0fc4e687f966a8f2fabce73e0c6f31f7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-06-22 00:20:12 +0200'>2018-06-22</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=1a135896b3c8bca17f70c2b90caaa205cbd781ec'>gnu: vpnc-scripts: Update to 20180226.07c3518.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-06-22 00:20:11 +0200'>2018-06-22</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=863501b723adc496d49ee329c035648020f43b2f'>gnu: vpnc-scripts: Return #t from all phases.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-04-30 04:03:54 -0400'>2018-04-30</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-04-26 21:08:57 +0200'>2018-04-26</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=a3cbd75bb3bde551cf138659b51d9cd725b74588'>gnu: openvpn: Update to 2.4.6.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-04-22 23:50:49 +0200'>2018-04-22</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=01224157b7714ff5a7931475943f9479d09c62a3'>gnu: Add ocproxy.</a><span class='msg-avail'>...</span></td><td>Pierre Langlois</td></tr>
<tr><td><span title='2018-04-10 00:42:22 -0400'>2018-04-10</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=f89aa1521af69b0e1a1350c2380579788b0f8945'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-04-05 06:38:56 +0200'>2018-04-05</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=dc944249d9297d5e3339cf60a54c680316ef8c23'>gnu: sshuttle: Update to 0.78.4.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-03-16 09:08:31 -0400'>2018-03-16</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=6cbee49d6668eb7fd738080666f66febfce8c7e8'>gnu: All snippets report errors using exceptions, else return #t.</a><span class='msg-avail'>...</span></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2018-03-13 21:48:28 +0200'>2018-03-13</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=728ee9d6f7257baa51eb6fccd25d62fe2134d9fe'>gnu: vpnc-scripts: Declare a source file-name.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2018-03-05 17:32:09 +0100'>2018-03-05</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=9599339c5982d0c446d04c1c1c7baef319ee6421'>gnu: openvpn: Mark up description.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-03-05 17:32:09 +0100'>2018-03-05</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=0d34993a6579d294cad4fad667b0c2a0b8173d06'>gnu: openvpn: Update to 2.4.5.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-02-26 20:13:08 +0100'>2018-02-26</span></td><td><a href='/guix/commit/gnu/packages/vpn.scm?id=383ad03e832ec52c3e24780cb188e5ec71ae7620'>gnu: tinc: Update to 1.0.33.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>