Mercurial > audlegacy
changeset 1025:2b42e48a688e trunk
[svn] - fix a potential crash in our read callback (for VFS)
- typo fix
| author | nenolod |
|---|---|
| date | Wed, 10 May 2006 17:54:49 -0700 |
| parents | 3b1dec2c5da0 |
| children | 1a73946ddfbd |
| files | Plugins/Input/aac/src/libmp4.c configure.ac |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Input/aac/src/libmp4.c Wed May 10 16:01:35 2006 -0700 +++ b/Plugins/Input/aac/src/libmp4.c Wed May 10 17:54:49 2006 -0700 @@ -124,9 +124,11 @@ uint32_t mp4_read_callback(void *data, void *buffer, uint32_t len) { - if (data == NULL) + if (data == NULL || buffer == NULL) return -1; +// printf("%p\n", data); + return vfs_fread(buffer, 1, len, (VFSFile *) data); }
--- a/configure.ac Wed May 10 16:01:35 2006 -0700 +++ b/configure.ac Wed May 10 17:54:49 2006 -0700 @@ -845,7 +845,7 @@ Plugins/Input/mpg123/Makefile Plugins/Input/aac/Makefile Plugins/Input/aac/libmp4v2/Makefile - Plugins/Input/aac/libmp4ff/Makefile + Plugins/Input/aac/mp4ff/Makefile Plugins/Input/aac/libfaad2/Makefile Plugins/Input/aac/src/Makefile Plugins/Input/modplug/Makefile