On 12/20/2014 04:41 PM, John Paul Adrian Glaubitz wrote: > Attaching the debdiff of my suggested NMU in any case.
Attaching a revised version as my first patch contained a formatting error in the debian/changelog file. Cheers, Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
diff -Nru djmount-0.71/debian/changelog djmount-0.71/debian/changelog --- djmount-0.71/debian/changelog 2013-01-21 22:05:45.000000000 +0100 +++ djmount-0.71/debian/changelog 2014-12-20 16:47:53.000000000 +0100 @@ -1,3 +1,13 @@ +djmount (0.71-6.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: + + Added: 004-avoid-crash-by-using-size_t.patch: + - Fixes segfault on 64-bit architectures when reading files + from a mounted DLNA share (Closes: #674753, #701680). + + -- John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> Sat, 20 Dec 2014 16:30:13 +0100 + djmount (0.71-6) unstable; urgency=low * debian/control: diff -Nru djmount-0.71/debian/patches/004-avoid-crash-by-using-size_t.patch djmount-0.71/debian/patches/004-avoid-crash-by-using-size_t.patch --- djmount-0.71/debian/patches/004-avoid-crash-by-using-size_t.patch 1970-01-01 01:00:00.000000000 +0100 +++ djmount-0.71/debian/patches/004-avoid-crash-by-using-size_t.patch 2014-12-20 16:29:35.000000000 +0100 @@ -0,0 +1,16 @@ +Description: Avoid crash by using size_t instead of unsigned int +Author: Bernhard Ãbelacker <bernha...@vr-web.de> +Bug-Debian: https://bugs.debian.org/701680 +Last-Update: <2014-12-12> + +--- djmount-0.71.orig/djmount/file_buffer.c ++++ djmount-0.71/djmount/file_buffer.c +@@ -212,7 +212,7 @@ FileBuffer_Read (FileBuffer* file, char* + * to return the exact number of bytes requested. + */ + do { +- unsigned int read_size = size - n; ++ size_t read_size = size - n; + if (n > 0) { + Log_Printf (LOG_DEBUG, + "UpnpReadHttpGet loop ! url '%s' " diff -Nru djmount-0.71/debian/patches/series djmount-0.71/debian/patches/series --- djmount-0.71/debian/patches/series 2013-01-21 22:05:45.000000000 +0100 +++ djmount-0.71/debian/patches/series 2014-12-20 16:30:04.000000000 +0100 @@ -2,3 +2,4 @@ 000_djmount.1.diff 001-libupnp-1.6.6.diff 002-libupnp-1.6.13.diff +004-avoid-crash-by-using-size_t.patch
