yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'stb_vorbis-fix-comment-read-oom' of https://github.com/akien-mga/stb into working

Browse Source
This commit is contained in:
Sean Barrett 2020-07-13 04:15:48 -07:00
commit 580fc1ab9b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stb_vorbis.c
View File

@ -32,7 +32,7 @@
// github:manxorist saga musix github:infatum // github:manxorist saga musix github:infatum
// Timur Gagiev Maxwell Koo Peter Waller // Timur Gagiev Maxwell Koo Peter Waller
// github:audinowho Dougall Johnson David Reid // github:audinowho Dougall Johnson David Reid
// github:Clownacy Pedro J. Estebanez // github:Clownacy Pedro J. Estebanez Remi Verschelde
// //
// Partial history: // Partial history:
// 1.19 - 2020-02-05 - warnings // 1.19 - 2020-02-05 - warnings
@ -3634,6 +3634,7 @@ static int start_decoder(vorb *f)
//file vendor //file vendor
len = get32_packet(f); len = get32_packet(f);
f->vendor = (char*)setup_malloc(f, sizeof(char) * (len+1)); f->vendor = (char*)setup_malloc(f, sizeof(char) * (len+1));
if (f->vendor == NULL) return error(f, VORBIS_outofmem);
for(i=0; i < len; ++i) { for(i=0; i < len; ++i) {
f->vendor[i] = get8_packet(f); f->vendor[i] = get8_packet(f);
} }
@ -3641,10 +3642,12 @@ static int start_decoder(vorb *f)
//user comments //user comments
f->comment_list_length = get32_packet(f); f->comment_list_length = get32_packet(f);
f->comment_list = (char**)setup_malloc(f, sizeof(char*) * (f->comment_list_length)); f->comment_list = (char**)setup_malloc(f, sizeof(char*) * (f->comment_list_length));
if (f->comment_list == NULL) return error(f, VORBIS_outofmem);
for(i=0; i < f->comment_list_length; ++i) { for(i=0; i < f->comment_list_length; ++i) {
len = get32_packet(f); len = get32_packet(f);
f->comment_list[i] = (char*)setup_malloc(f, sizeof(char) * (len+1)); f->comment_list[i] = (char*)setup_malloc(f, sizeof(char) * (len+1));
if (f->comment_list[i] == NULL) return error(f, VORBIS_outofmem);
for(j=0; j < len; ++j) { for(j=0; j < len; ++j) {
f->comment_list[i][j] = get8_packet(f); f->comment_list[i][j] = get8_packet(f);