[SCM] mediatomb/master: Fixes issue for files with length > 999 hours.

micove-guest at users.alioth.debian.org micove-guest at users.alioth.debian.org
Sun Mar 4 04:52:17 UTC 2012


The following commit has been merged in the master branch:
commit c336c83551781cae63787a27fb372e36725e2aae
Author: Miguel Colon <debian.micove at gmail.com>
Date:   Sat Mar 3 23:34:04 2012 -0500

    Fixes issue for files with length > 999 hours.

diff --git a/debian/patches/buffer_overrun_999hours.patch b/debian/patches/buffer_overrun_999hours.patch
new file mode 100644
index 0000000..640c7da
--- /dev/null
+++ b/debian/patches/buffer_overrun_999hours.patch
@@ -0,0 +1,21 @@
+Description: Fixes issue for files with length > 999 hours.
+ Fixes issue where files > 999 hours in length overrun the minutes buffer. Some
+ shorter files may incorrectly be reported as over 999 hours and make the
+ program crash.
+Origin: other, http://pkgs.fedoraproject.org/gitweb/?p=mediatomb.git;a=commit;h=f648bc71
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=651414
+Last-Update: 2012-03-03
+
+diff -up ./src/tools.cc.fixbufferoverrun ./src/tools.cc
+--- ./src/tools.cc.fixbufferoverrun	2010-11-22 00:57:31.387188000 -0500
++++ ./src/tools.cc	2010-11-22 00:57:44.865188000 -0500
+@@ -665,6 +665,9 @@ String secondsToHMS(int seconds)
+     h = seconds / 60;
+ 
+     // XXX:XX:XX
++		// This fails if h goes over 999
++		if (h > 999)
++			h = 999;
+     char *str = (char *)malloc(10);
+     sprintf(str, "%02d:%02d:%02d", h, m, s);
+     return String::take(str);
diff --git a/debian/patches/series b/debian/patches/series
index 14ca131..79bce73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ js_1.8_support.patch
 js_parse.patch
 libmozjs185_support.patch
 gcc_4.7_support.patch
+buffer_overrun_999hours.patch

-- 
MediaTomb packaging



More information about the pkg-multimedia-commits mailing list