[SCM] libquicktime/master: Some improvements.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu May 26 08:08:23 UTC 2011


The following commit has been merged in the master branch:
commit 27308181cc05a8353b7e21a855059947fb22cdf1
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 26 10:08:16 2011 +0200

    Some improvements.

diff --git a/debian/patches/12-dont_use_pathmax.patch b/debian/patches/12-dont_use_pathmax.patch
index 6f9ae2e..4fac1aa 100644
--- a/debian/patches/12-dont_use_pathmax.patch
+++ b/debian/patches/12-dont_use_pathmax.patch
@@ -2,8 +2,9 @@ Author: Alessio Treglia <alessio at debian.org>
 Description: Avoid unconditionalized use of PATH_MAX to fix FTBFS on hurd.
 Forwarded: Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
 ---
- src/lqt_codecfile.c |    6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ src/lqt_codecfile.c |   11 ++++++++++-
+ src/lqt_codecinfo.c |    3 +--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
 
 --- libquicktime.orig/src/lqt_codecfile.c
 +++ libquicktime/src/lqt_codecfile.c
@@ -32,3 +33,39 @@ Forwarded: Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
    
    
  }
+@@ -1057,6 +1061,9 @@ void lqt_registry_write()
+     }
+   fclose(output);
+   lqt_registry_unlock();
++  if (filename_buffer) {
++      free(filename_buffer);
++  }
+ 
+   return;
+ fail:
+@@ -1066,4 +1073,6 @@ fail:
+   lqt_log(NULL, LQT_LOG_INFO, LOG_DOMAIN,
+           "%s could not be written, deleting imcomplete file", filename_buffer);
+   remove(filename_buffer);
++  if (filename_buffer)
++      { free(filename_buffer); }
+   }
+--- libquicktime.orig/src/lqt_codecinfo.c
++++ libquicktime/src/lqt_codecinfo.c
+@@ -611,8 +611,6 @@ static int scan_for_plugins(const char *
+   lqt_codec_info_t * video_codecs_end;
+   lqt_codec_info_t * audio_codecs_end;
+ 
+-  filename = malloc(PATH_MAX * sizeof(char));
+-  
+   /* Set the end pointers so we can quickly add codecs after */
+ 
+   
+@@ -662,6 +660,7 @@ static int scan_for_plugins(const char *
+     
+     /* Now, the file should be a valid plugin, construct the filename */
+     
++    filename = malloc(strlen(plugin_dir) + strlen(directory_entry->d_name) + 2);
+     strcpy(filename, plugin_dir);
+     strcat(filename, "/");
+     strcat(filename, directory_entry->d_name);

-- 
libquicktime packaging



More information about the pkg-multimedia-commits mailing list