Merge lp:~johnjay/ubuntu/trusty/djmount/fix-segfault-1322813 into lp:ubuntu/trusty/djmount

[JohnJay]

[JohnJay (johnjay)]

This is intended to mirror the 0.71-7 version available for the later ubuntu releases. As far as I'm aware they have the same codebase, so I'm not sure if there's a more direct way to do this (I pulled out the trusty version and applied the patch, wrote the new commit message etc, rather than pull in the other commit directly if that makes sense in bazaar).

[JohnJay (johnjay)]

Some further research suggests that perhaps this should have been a sync request instead?

[Brian Murray (brian-murray)]

Thanks for working on this, the version numbering should following the following recommendations.

https://wiki.ubuntu.com/SecurityTeam/UpdatePreparation#Update_the_packaging

So, you wouldn't want to change the version in the changelog to 0.71-7ubuntu0.1, additionally you'll want to replace unstable with trusty since that is what we are fixing it in. Finally, a reference to the Launchpad bug number should be made for the Stable Release Update process e.g. (LP: #1322813). You can learn more about the SRU process at https://wiki.ubuntu.com/StableReleaseUpdates.

Thanks for working on this!

review: Needs Fixing

Unmerged revisions

8. By JohnJay on 2016-04-16

* debian/patches/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)
     Thanks to Bernhard Übelacker <email address hidden> and
     John Paul Adrian Glaubitz <email address hidden>

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-21 20:55:07 +0000
+++ debian/changelog	2016-04-16 17:12:18 +0000
@@ -1,3 +1,13 @@
+djmount (0.71-7) unstable; urgency=medium
+
+  * debian/patches/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)
+       Thanks to Bernhard Übelacker <[e-mail]> and 
+       John Paul Adrian Glaubitz <[e-mail]>    
+
+ -- JohnJay <[e-mail]>  Sat, 16 Apr 2016 17:53:05 +0100
+
 djmount (0.71-6) unstable; urgency=low
 
   * debian/control:
 
=== added file 'debian/patches/004-avoid-crash-by-using-size_t.patch'
--- debian/patches/004-avoid-crash-by-using-size_t.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/004-avoid-crash-by-using-size_t.patch	2016-04-16 17:12:18 +0000
@@ -0,0 +1,14 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+--- a/djmount/file_buffer.c
++++ b/djmount/file_buffer.c
+@@ -212,7 +212,7 @@
+ 		 * 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' "
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-04-21 16:56:57 +0000
+++ debian/patches/series	2016-04-16 17:12:18 +0000
@@ -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