diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-11 13:45:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 13:45:14 +0200 |
| commit | 60c6cf9f71c98ca4d85d976fa8767f22a057c0f5 (patch) | |
| tree | f25e8a6c9e5e011df0c7aba95631cd687bb1cba4 /thirdparty | |
| parent | 36d587fc7f5061aebc34fa5168ec98e29f001ae2 (diff) | |
| parent | 3e727bc659345bd8d4624e53a6256df5f1a43d86 (diff) | |
Merge pull request #30513 from akien-mga/stb_vorbis-1.16
stb_vorbis: Update to upstream version 1.16
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/misc/stb_vorbis.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index b20cc1fe8c..79a1ca772a 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -391,7 +391,7 @@ Collection of single-file libraries used in Godot components. * License: Public Domain (Unlicense) or MIT - `stb_vorbis.c` * Upstream: https://github.com/nothings/stb - * Version: 1.15 + * Version: 1.16 * License: Public Domain (Unlicense) or MIT diff --git a/thirdparty/misc/stb_vorbis.c b/thirdparty/misc/stb_vorbis.c index 88276026ef..71af404dae 100644 --- a/thirdparty/misc/stb_vorbis.c +++ b/thirdparty/misc/stb_vorbis.c @@ -1,4 +1,4 @@ -// Ogg Vorbis audio decoder - v1.15 - public domain +// Ogg Vorbis audio decoder - v1.16 - public domain // http://nothings.org/stb_vorbis/ // // Original version written by Sean Barrett in 2007. @@ -33,6 +33,7 @@ // Timur Gagiev // // Partial history: +// 1.16 - 2019-03-04 - fix warnings // 1.15 - 2019-02-07 - explicit failure if Ogg Skeleton data is found // 1.14 - 2018-02-11 - delete bogus dealloca usage // 1.13 - 2018-01-29 - fix truncation of last frame (hopefully) @@ -4990,7 +4991,13 @@ stb_vorbis * stb_vorbis_open_file(FILE *file, int close_on_free, int *error, con stb_vorbis * stb_vorbis_open_filename(const char *filename, int *error, const stb_vorbis_alloc *alloc) { - FILE *f = fopen(filename, "rb"); + FILE *f; +#if defined(_WIN32) && defined(__STDC_WANT_SECURE_LIB__) + if (0 != fopen_s(&f, filename, "rb")) + f = NULL; +#else + f = fopen(filename, "rb"); +#endif if (f) return stb_vorbis_open_file(f, TRUE, error, alloc); if (error) *error = VORBIS_file_open_failure; |