Mercurial > audlegacy
changeset 1317:a698348c5155 trunk
[svn] - libaac: potential buffer overflow vulnerability fix
- libguess: build as a static library instead of installing as a shared object (via dai+audacious -at- vdr.jp)
| author | nenolod |
|---|---|
| date | Mon, 19 Jun 2006 23:39:11 -0700 |
| parents | 276cc2ce63b7 |
| children | a344e9836a4e |
| files | ChangeLog Plugins/Input/aac/src/libmp4.c audacious/Makefile configure.ac libguess/Makefile.in |
| diffstat | 5 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 19 23:19:46 2006 -0700 +++ b/ChangeLog Mon Jun 19 23:39:11 2006 -0700 @@ -1,3 +1,12 @@ +2006-06-20 06:19:46 +0000 William Pitcock <nenolod@nenolod.net> + revision [1544] + - category titles + + + Changes: Modified: + +8 -9 trunk/audtool/audtool.c + + 2006-06-20 06:00:03 +0000 William Pitcock <nenolod@nenolod.net> revision [1542] - chase encoding patch removal
--- a/Plugins/Input/aac/src/libmp4.c Mon Jun 19 23:19:46 2006 -0700 +++ b/Plugins/Input/aac/src/libmp4.c Mon Jun 19 23:39:11 2006 -0700 @@ -496,7 +496,7 @@ bufferSize=0; /* If we've run to the end of the file, we're done. */ - if(sampleID > numSamples){ + if(sampleID >= numSamples){ /* Finish playing before we close the output. */ while ( mp4_ip.output->buffer_playing() ) {
--- a/audacious/Makefile Mon Jun 19 23:19:46 2006 -0700 +++ b/audacious/Makefile Mon Jun 19 23:39:11 2006 -0700 @@ -13,7 +13,7 @@ $(LIBGLADE_LIBS) \ -L.. $(LTLIBINTL) \ -L../libaudacious -laudacious \ - -L../libguess $(CHARDET_LIBS) + $(CHARDET_LIBS) CFLAGS += \ $(GTK_CFLAGS) \
--- a/configure.ac Mon Jun 19 23:19:46 2006 -0700 +++ b/configure.ac Mon Jun 19 23:39:11 2006 -0700 @@ -193,8 +193,7 @@ enable_chardet=$enableval, enable_chardet=no) if test "x$enable_chardet" = xyes; then AC_DEFINE(USE_CHARDET, 1, [Define if character set detection enabled] ) - AC_CHECK_LIB(guess, guess_jp, [SUBDIR_GUESS=['']], [SUBDIR_GUESS=['libguess']]) - CHARDET_LIBS=['-lguess'] + AC_CHECK_LIB(guess, guess_jp, [SUBDIR_GUESS=[''] CHARDET_LIBS=['-lguess']], [SUBDIR_GUESS=['libguess'] CHARDET_LIBS=['../libguess/libguess.a']]) AC_CHECK_LIB(udet_c, detectCharset, [AC_DEFINE(HAVE_UDET, 1,[Define if the system has Mozilla universal character detector library]) CHARDET_LIBS=["$CHARDET_LIBS -ludet -ludet_c"]]) fi AM_CONDITIONAL(USE_CHARDET,test "x$enable_chardet" = xyes)
--- a/libguess/Makefile.in Mon Jun 19 23:19:46 2006 -0700 +++ b/libguess/Makefile.in Mon Jun 19 23:39:11 2006 -0700 @@ -1,7 +1,7 @@ include ../mk/rules.mk include ../mk/objective.mk -OBJECTIVE_LIBS = libguess.so +OBJECTIVE_LIBS_NOINST = libguess.a OBJECTIVE_SONAME_SUFFIX = 0.2.0 LDFLAGS += -Wl,-export-dynamic @@ -13,12 +13,5 @@ OBJECTS = ${SOURCES:.c=.o} -HEADERS = \ - libguess.h - -install-posthook: - @mv ${DESTDIR}/${LIBDIR}/libguess.so ${DESTDIR}/${LIBDIR}/libguess.so.0.2.0 - @ln -sf ${LIBDIR}/libguess.so.0.2.0 \ - ${DESTDIR}/${LIBDIR}/libguess.so.0 - @ln -sf ${LIBDIR}/libguess.so.0 \ - ${DESTDIR}/${LIBDIR}/libguess.so +libguess.a: $(OBJECTS) + $(AR) cq $@ $(OBJECTS)