]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3c461ee ff3db93)
Merge commit 'ff3db937ef3aa30046a3936146f86ad48ee2ff90'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:07:03 +0000 (16:07 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:08:44 +0000 (16:08 +0100)
commitbfd0f42277d1fab7b354f80f5e158e15a75f34ee
tree79e33a31b208432d505b8857b0fa94a8c514245atree | snapshot
parent3c461eecd48ba2cf7616d98e6f99954de3ad4b06commit | diff
parentff3db937ef3aa30046a3936146f86ad48ee2ff90commit | diff
Merge commit 'ff3db937ef3aa30046a3936146f86ad48ee2ff90'

This commit is a no-op. As far as I can tell, we already added
checks, to address this CVE in 7c0b84d89911b2035161f5ef51aafbfcc84aa9e2,
which is also reflected in the CVE database:

    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2326

* commit 'ff3db937ef3aa30046a3936146f86ad48ee2ff90':
  asfenc: fix some possible integer overflows

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Unnamed repository; edit this file 'description' to name the repository.