Mercurial > hg > nginx
annotate auto/lib/zlib/makefile.msvc @ 9322:d6f75dd66761 default tip
Mp4: added and updated sanity checks for "end" handling.
When handling incorrect data in ngx_http_mp4_crop_stsc_data(),
trak->end_chunk_samples might end up being arbitrary large, leading
to reading before the buffer in ngx_http_mp4_update_stsz_atom(). Fix
is to check that trak->end_chunk_samples corresponds to a memory within
the stsz atom data. For consistency, trak->start_chunk_samples
is checked similarly.
Similarly, trak->end_chunk might end up being smaller than trak->start_chunk,
leading to reading memory after the buffer in ngx_http_mp4_update_stco_atom()
and ngx_http_mp4_update_co64_atom(). Corresponding checks are updated
to explicitly test (trak->end_chunk - trak->start_chunk) instead of just
checking trak->end_chunk and assuming it is larger than trak->start_chunk.
This is generally in line with existing checks of
(trak->end_sample - trak->start_sample) in ngx_http_mp4_update_stsz_atom(),
where trak->end_sample might also become smaller than trak->start_sample
when handling incorrect data in ngx_http_mp4_crop_stts_data().
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sun, 25 Aug 2024 06:35:40 +0300 |
parents | 9d458803bbe0 |
children |
rev | line source |
---|---|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
1 |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
4412 | 3 # Copyright (C) Nginx, Inc. |
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
4 |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
286
diff
changeset
|
6 CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 zlib.lib: |
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
493
diff
changeset
|
9 cd $(ZLIB) |
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
493
diff
changeset
|
10 |
4839
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
11 cl -c $(CFLAGS) adler32.c crc32.c deflate.c \ |
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
12 trees.c zutil.c compress.c \ |
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
13 inflate.c inffast.c inftrees.c |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
14 |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
15 link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \ |
4839
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
16 trees.obj zutil.obj compress.obj \ |
9d458803bbe0
Configure: provide inflate() when building zlib on win32.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
17 inflate.obj inffast.obj inftrees.obj |