SHA256
1
0
forked from pool/libquicktime

Accepting request 508079 from home:kstreitova:branches:multimedia:libs

- adjust libquicktime-1.2.4-integer_overflow.patch to prevent
  endless loop when there are less than 256 bytes to read
  [bsc#1022805] CVE-2016-2399

OBS-URL: https://build.opensuse.org/request/show/508079
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=72
This commit is contained in:
Tomáš Chvátal 2017-07-04 11:15:02 +00:00 committed by Git OBS Bridge
parent 63a6e62cac
commit d761c3967f
2 changed files with 23 additions and 7 deletions

View File

@ -1,13 +1,22 @@
Index: libquicktime-1.2.4/src/util.c
Index: libquicktime/src/util.c
===================================================================
--- libquicktime-1.2.4.orig/src/util.c
+++ libquicktime-1.2.4/src/util.c
@@ -340,7 +340,7 @@ int64_t quicktime_byte_position(quicktim
--- libquicktime.orig/src/util.c
+++ libquicktime/src/util.c
@@ -376,9 +376,14 @@ int64_t quicktime_byte_position(quicktim
void quicktime_read_pascal(quicktime_t *file, char *data)
{
- char len = quicktime_read_char(file);
+ unsigned char len = quicktime_read_char(file);
quicktime_read_data(file, (uint8_t*)data, len);
data[(int)len] = 0;
- quicktime_read_data(file, (uint8_t*)data, len);
- data[(int)len] = 0;
+ int len = quicktime_read_char(file);
+ if ((len > 0) && (len < 256)) {
+ /* data[] is expected to be 256 bytes long */
+ quicktime_read_data(file, (uint8_t*)data, len);
+ data[len] = 0;
+ } else {
+ data[0] = 0;
+ }
}
void quicktime_write_pascal(quicktime_t *file, char *data)

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 4 10:28:44 UTC 2017 - kstreitova@suse.com
- adjust libquicktime-1.2.4-integer_overflow.patch to prevent
endless loop when there are less than 256 bytes to read
[bsc#1022805] CVE-2016-2399
-------------------------------------------------------------------
Fri Jun 23 21:58:19 UTC 2017 - kstreitova@suse.com