diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-03 09:52:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 09:52:35 +0200 |
| commit | a928a10e835190539c3f704bb18ac56a75efddea (patch) | |
| tree | 41e445140dd62539114858f2ae02648d127e7106 | |
| parent | f5cd33f39df3f4e0b59cf39ed2d8375928b998d9 (diff) | |
| parent | d259094c3aba09644e0ef8c58388d5377d7b5982 (diff) | |
Merge pull request #38422 from RandomShaper/fix_stb_vorbis
Fix crash in stb_vorbis.c
| -rw-r--r-- | thirdparty/README.md | 1 | ||||
| -rw-r--r-- | thirdparty/misc/stb_vorbis.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 5821ca1424..1a3588e0e0 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -422,6 +422,7 @@ Collection of single-file libraries used in Godot components. * Upstream: https://github.com/nothings/stb * Version: 1.19 * License: Public Domain (Unlicense) or MIT + * Modifications: `f->temp_offset += (sz+3)&~3;` changed to `f->temp_offset += (sz+7)&~7;` (needed until fixed upstream) ## nanosvg diff --git a/thirdparty/misc/stb_vorbis.c b/thirdparty/misc/stb_vorbis.c index b28944a4d9..b0d79b1724 100644 --- a/thirdparty/misc/stb_vorbis.c +++ b/thirdparty/misc/stb_vorbis.c @@ -961,7 +961,7 @@ static void *setup_temp_malloc(vorb *f, int sz) static void setup_temp_free(vorb *f, void *p, int sz) { if (f->alloc.alloc_buffer) { - f->temp_offset += (sz+3)&~3; + f->temp_offset += (sz+7)&~7; return; } free(p); |