[arch-commits] Commit in libcdio/repos (14 files)

Jan de Groot jgc at archlinux.org
Tue Jan 15 11:44:42 UTC 2013


    Date: Tuesday, January 15, 2013 @ 06:44:42
  Author: jgc
Revision: 175152

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libcdio/repos/extra-i686/PKGBUILD
    (from rev 175151, libcdio/trunk/PKGBUILD)
  libcdio/repos/extra-i686/libcdio-0.83-linking.patch
    (from rev 175151, libcdio/trunk/libcdio-0.83-linking.patch)
  libcdio/repos/extra-i686/libcdio.install
    (from rev 175151, libcdio/trunk/libcdio.install)
  libcdio/repos/extra-i686/udf-Dont-return-freed-memory-from-udf_fopen.patch
    (from rev 175151, libcdio/trunk/udf-Dont-return-freed-memory-from-udf_fopen.patch)
  libcdio/repos/extra-x86_64/PKGBUILD
    (from rev 175151, libcdio/trunk/PKGBUILD)
  libcdio/repos/extra-x86_64/libcdio-0.83-linking.patch
    (from rev 175151, libcdio/trunk/libcdio-0.83-linking.patch)
  libcdio/repos/extra-x86_64/libcdio.install
    (from rev 175151, libcdio/trunk/libcdio.install)
  libcdio/repos/extra-x86_64/udf-Dont-return-freed-memory-from-udf_fopen.patch
    (from rev 175151, libcdio/trunk/udf-Dont-return-freed-memory-from-udf_fopen.patch)
Deleted:
  libcdio/repos/extra-i686/PKGBUILD
  libcdio/repos/extra-i686/libcdio-0.83-linking.patch
  libcdio/repos/extra-i686/libcdio.install
  libcdio/repos/extra-x86_64/PKGBUILD
  libcdio/repos/extra-x86_64/libcdio-0.83-linking.patch
  libcdio/repos/extra-x86_64/libcdio.install

----------------------------------------------------------------+
 extra-i686/PKGBUILD                                            |   71 +++++-----
 extra-i686/libcdio-0.83-linking.patch                          |   44 +++---
 extra-i686/libcdio.install                                     |   26 +--
 extra-i686/udf-Dont-return-freed-memory-from-udf_fopen.patch   |   33 ++++
 extra-x86_64/PKGBUILD                                          |   71 +++++-----
 extra-x86_64/libcdio-0.83-linking.patch                        |   44 +++---
 extra-x86_64/libcdio.install                                   |   26 +--
 extra-x86_64/udf-Dont-return-freed-memory-from-udf_fopen.patch |   33 ++++
 8 files changed, 210 insertions(+), 138 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-01-15 11:44:03 UTC (rev 175151)
+++ extra-i686/PKGBUILD	2013-01-15 11:44:42 UTC (rev 175152)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=libcdio
-pkgver=0.90
-pkgrel=1
-pkgdesc="GNU Compact Disc Input and Control Library"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/libcdio/"
-depends=('libcddb' 'ncurses' 'gcc-libs')
-options=('!libtool')
-install=libcdio.install
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
-        libcdio-0.83-linking.patch)
-md5sums=('1b245b023fb03a58d030fd2800db3247'
-         '45100d90ea49d6f8481eddf709655c0f'
-         '5a7f50209c03d5919d5b932f07871af7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
-  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  
-  sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
-    $pkgdir/usr/include/cdio/cdio_config.h
-}

Copied: libcdio/repos/extra-i686/PKGBUILD (from rev 175151, libcdio/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-01-15 11:44:42 UTC (rev 175152)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer:
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=libcdio
+pkgver=0.90
+pkgrel=2
+pkgdesc="GNU Compact Disc Input and Control Library"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://www.gnu.org/software/libcdio/"
+depends=('libcddb' 'ncurses' 'gcc-libs')
+options=('!libtool')
+install=libcdio.install
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
+        libcdio-0.83-linking.patch
+        udf-Dont-return-freed-memory-from-udf_fopen.patch)
+md5sums=('1b245b023fb03a58d030fd2800db3247'
+         '45100d90ea49d6f8481eddf709655c0f'
+         '5a7f50209c03d5919d5b932f07871af7'
+         'b7b50c989575e5484d3992b455c9df48')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../libcdio-0.83-linking.patch
+  patch -Np1 -i ../udf-Dont-return-freed-memory-from-udf_fopen.patch
+  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR="${pkgdir}" install
+  
+  sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
+    $pkgdir/usr/include/cdio/cdio_config.h
+}

Deleted: extra-i686/libcdio-0.83-linking.patch
===================================================================
--- extra-i686/libcdio-0.83-linking.patch	2013-01-15 11:44:03 UTC (rev 175151)
+++ extra-i686/libcdio-0.83-linking.patch	2013-01-15 11:44:42 UTC (rev 175152)
@@ -1,22 +0,0 @@
-diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
---- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
-+++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
-@@ -315,15 +315,15 @@
- 
- isofile2_SOURCES = isofile2.cpp
- isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- isolist_SOURCES = isolist.cpp
- isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- iso4_SOURCES = iso4.cpp
- iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- mmc1_SOURCES = mmc1.cpp
- mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)

Copied: libcdio/repos/extra-i686/libcdio-0.83-linking.patch (from rev 175151, libcdio/trunk/libcdio-0.83-linking.patch)
===================================================================
--- extra-i686/libcdio-0.83-linking.patch	                        (rev 0)
+++ extra-i686/libcdio-0.83-linking.patch	2013-01-15 11:44:42 UTC (rev 175152)
@@ -0,0 +1,22 @@
+diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
+--- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
++++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
+@@ -315,15 +315,15 @@
+ 
+ isofile2_SOURCES = isofile2.cpp
+ isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ isolist_SOURCES = isolist.cpp
+ isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ iso4_SOURCES = iso4.cpp
+ iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ mmc1_SOURCES = mmc1.cpp
+ mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)

Deleted: extra-i686/libcdio.install
===================================================================
--- extra-i686/libcdio.install	2013-01-15 11:44:03 UTC (rev 175151)
+++ extra-i686/libcdio.install	2013-01-15 11:44:42 UTC (rev 175152)
@@ -1,13 +0,0 @@
-info_dir=/usr/share/info
-
-post_install() {
-  install-info ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  install-info --delete ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
-}

Copied: libcdio/repos/extra-i686/libcdio.install (from rev 175151, libcdio/trunk/libcdio.install)
===================================================================
--- extra-i686/libcdio.install	                        (rev 0)
+++ extra-i686/libcdio.install	2013-01-15 11:44:42 UTC (rev 175152)
@@ -0,0 +1,13 @@
+info_dir=/usr/share/info
+
+post_install() {
+  install-info ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  install-info --delete ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
+}

Copied: libcdio/repos/extra-i686/udf-Dont-return-freed-memory-from-udf_fopen.patch (from rev 175151, libcdio/trunk/udf-Dont-return-freed-memory-from-udf_fopen.patch)
===================================================================
--- extra-i686/udf-Dont-return-freed-memory-from-udf_fopen.patch	                        (rev 0)
+++ extra-i686/udf-Dont-return-freed-memory-from-udf_fopen.patch	2013-01-15 11:44:42 UTC (rev 175152)
@@ -0,0 +1,33 @@
+From 6c0251d145e44b7cdfeb9767c615646fb8f51320 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Thu, 22 Nov 2012 13:53:15 +0100
+Subject: [PATCH] udf: Don't return freed memory from udf_fopen
+
+When trying to open a file located in the root directory of the
+UDF filesystem, we call udf_ff_open with the dirent corresponding
+to the root dir and the filename. In this case, udf_ff_open will
+return the same dirent as the one that was passed as argument, so
+we must not free it as we'll be returning it.
+This causes a crash with iso-read when trying to read a file located
+at the root of the image.
+---
+ lib/udf/udf_fs.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c
+index 5f5add7..1e0601e 100644
+--- a/lib/udf/udf_fs.c
++++ b/lib/udf/udf_fs.c
+@@ -257,7 +257,8 @@ udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name)
+ 		       p_udf_root->psz_name, p_udf_root->b_dir, 
+ 		       p_udf_root->b_parent);
+       p_udf_file = udf_ff_traverse(p_udf_dirent, psz_token);
+-      udf_dirent_free(p_udf_dirent);
++      if (p_udf_file != p_udf_dirent)
++        udf_dirent_free(p_udf_dirent);
+     }
+     else if ( 0 == strncmp("/", psz_name, sizeof("/")) ) {
+       return udf_new_dirent(&p_udf_root->fe, p_udf_root->p_udf,
+-- 
+1.7.2.5
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-01-15 11:44:03 UTC (rev 175151)
+++ extra-x86_64/PKGBUILD	2013-01-15 11:44:42 UTC (rev 175152)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=libcdio
-pkgver=0.90
-pkgrel=1
-pkgdesc="GNU Compact Disc Input and Control Library"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/libcdio/"
-depends=('libcddb' 'ncurses' 'gcc-libs')
-options=('!libtool')
-install=libcdio.install
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
-        libcdio-0.83-linking.patch)
-md5sums=('1b245b023fb03a58d030fd2800db3247'
-         '45100d90ea49d6f8481eddf709655c0f'
-         '5a7f50209c03d5919d5b932f07871af7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
-  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  
-  sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
-    $pkgdir/usr/include/cdio/cdio_config.h
-}

Copied: libcdio/repos/extra-x86_64/PKGBUILD (from rev 175151, libcdio/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-01-15 11:44:42 UTC (rev 175152)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer:
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=libcdio
+pkgver=0.90
+pkgrel=2
+pkgdesc="GNU Compact Disc Input and Control Library"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://www.gnu.org/software/libcdio/"
+depends=('libcddb' 'ncurses' 'gcc-libs')
+options=('!libtool')
+install=libcdio.install
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
+        libcdio-0.83-linking.patch
+        udf-Dont-return-freed-memory-from-udf_fopen.patch)
+md5sums=('1b245b023fb03a58d030fd2800db3247'
+         '45100d90ea49d6f8481eddf709655c0f'
+         '5a7f50209c03d5919d5b932f07871af7'
+         'b7b50c989575e5484d3992b455c9df48')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../libcdio-0.83-linking.patch
+  patch -Np1 -i ../udf-Dont-return-freed-memory-from-udf_fopen.patch
+  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR="${pkgdir}" install
+  
+  sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
+    $pkgdir/usr/include/cdio/cdio_config.h
+}

Deleted: extra-x86_64/libcdio-0.83-linking.patch
===================================================================
--- extra-x86_64/libcdio-0.83-linking.patch	2013-01-15 11:44:03 UTC (rev 175151)
+++ extra-x86_64/libcdio-0.83-linking.patch	2013-01-15 11:44:42 UTC (rev 175152)
@@ -1,22 +0,0 @@
-diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
---- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
-+++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
-@@ -315,15 +315,15 @@
- 
- isofile2_SOURCES = isofile2.cpp
- isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- isolist_SOURCES = isolist.cpp
- isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- iso4_SOURCES = iso4.cpp
- iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- mmc1_SOURCES = mmc1.cpp
- mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)

Copied: libcdio/repos/extra-x86_64/libcdio-0.83-linking.patch (from rev 175151, libcdio/trunk/libcdio-0.83-linking.patch)
===================================================================
--- extra-x86_64/libcdio-0.83-linking.patch	                        (rev 0)
+++ extra-x86_64/libcdio-0.83-linking.patch	2013-01-15 11:44:42 UTC (rev 175152)
@@ -0,0 +1,22 @@
+diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
+--- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
++++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
+@@ -315,15 +315,15 @@
+ 
+ isofile2_SOURCES = isofile2.cpp
+ isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ isolist_SOURCES = isolist.cpp
+ isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ iso4_SOURCES = iso4.cpp
+ iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ mmc1_SOURCES = mmc1.cpp
+ mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)

Deleted: extra-x86_64/libcdio.install
===================================================================
--- extra-x86_64/libcdio.install	2013-01-15 11:44:03 UTC (rev 175151)
+++ extra-x86_64/libcdio.install	2013-01-15 11:44:42 UTC (rev 175152)
@@ -1,13 +0,0 @@
-info_dir=/usr/share/info
-
-post_install() {
-  install-info ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  install-info --delete ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
-}

Copied: libcdio/repos/extra-x86_64/libcdio.install (from rev 175151, libcdio/trunk/libcdio.install)
===================================================================
--- extra-x86_64/libcdio.install	                        (rev 0)
+++ extra-x86_64/libcdio.install	2013-01-15 11:44:42 UTC (rev 175152)
@@ -0,0 +1,13 @@
+info_dir=/usr/share/info
+
+post_install() {
+  install-info ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  install-info --delete ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
+}

Copied: libcdio/repos/extra-x86_64/udf-Dont-return-freed-memory-from-udf_fopen.patch (from rev 175151, libcdio/trunk/udf-Dont-return-freed-memory-from-udf_fopen.patch)
===================================================================
--- extra-x86_64/udf-Dont-return-freed-memory-from-udf_fopen.patch	                        (rev 0)
+++ extra-x86_64/udf-Dont-return-freed-memory-from-udf_fopen.patch	2013-01-15 11:44:42 UTC (rev 175152)
@@ -0,0 +1,33 @@
+From 6c0251d145e44b7cdfeb9767c615646fb8f51320 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Thu, 22 Nov 2012 13:53:15 +0100
+Subject: [PATCH] udf: Don't return freed memory from udf_fopen
+
+When trying to open a file located in the root directory of the
+UDF filesystem, we call udf_ff_open with the dirent corresponding
+to the root dir and the filename. In this case, udf_ff_open will
+return the same dirent as the one that was passed as argument, so
+we must not free it as we'll be returning it.
+This causes a crash with iso-read when trying to read a file located
+at the root of the image.
+---
+ lib/udf/udf_fs.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c
+index 5f5add7..1e0601e 100644
+--- a/lib/udf/udf_fs.c
++++ b/lib/udf/udf_fs.c
+@@ -257,7 +257,8 @@ udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name)
+ 		       p_udf_root->psz_name, p_udf_root->b_dir, 
+ 		       p_udf_root->b_parent);
+       p_udf_file = udf_ff_traverse(p_udf_dirent, psz_token);
+-      udf_dirent_free(p_udf_dirent);
++      if (p_udf_file != p_udf_dirent)
++        udf_dirent_free(p_udf_dirent);
+     }
+     else if ( 0 == strncmp("/", psz_name, sizeof("/")) ) {
+       return udf_new_dirent(&p_udf_root->fe, p_udf_root->p_udf,
+-- 
+1.7.2.5
+




More information about the arch-commits mailing list