[Pkg-voip-commits] r4173 - in wengophone/trunk/debian: . patches patches/generic

cavedon-guest at alioth.debian.org cavedon-guest at alioth.debian.org
Mon Aug 20 21:18:37 UTC 2007


Author: cavedon-guest
Date: 2007-08-20 21:18:37 +0000 (Mon, 20 Aug 2007)
New Revision: 4173

Added:
   wengophone/trunk/debian/patches/generic/phapi-fix-empty-ctype-dos.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/patches/series
Log:
Added patch generic/phapi-fix-empty-ctype-dos.patch to prevent crash on messages
with no Content-Type. Closes #438419


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2007-08-20 16:08:44 UTC (rev 4172)
+++ wengophone/trunk/debian/changelog	2007-08-20 21:18:37 UTC (rev 4173)
@@ -10,8 +10,10 @@
   [ Ludovico Cavedon ]
   * Added patch head/alsa-plughw-default.patch to enable selection of additional
     sound cards. Closes #435747
+  * Added patch generic/phapi-fix-empty-ctype-dos.patch to prevent crash on
+    messages with no Content-Type. Closes #438419
 
- -- Ludovico Cavedon <cavedon at sssup.it>  Mon, 20 Aug 2007 18:03:36 +0200
+ -- Ludovico Cavedon <cavedon at sssup.it>  Mon, 20 Aug 2007 23:16:27 +0200
 
 wengophone (2.1.1.dfsg0-2) unstable; urgency=low
 

Added: wengophone/trunk/debian/patches/generic/phapi-fix-empty-ctype-dos.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/phapi-fix-empty-ctype-dos.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/phapi-fix-empty-ctype-dos.patch	2007-08-20 21:18:37 UTC (rev 4173)
@@ -0,0 +1,23 @@
+Index: wengophone-2.1.1.dfsg0/wifo/phapi/phapi-old.c
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/wifo/phapi/phapi-old.c	2007-08-20 17:53:32.000000000 +0200
++++ wengophone-2.1.1.dfsg0/wifo/phapi/phapi-old.c	2007-08-20 17:56:10.000000000 +0200
+@@ -4475,8 +4475,16 @@
+ 		{
+ 			info.event = phMsgNew;
+ 			info.content = je->msg_body;
+-			info.ctype = je->i_ctt->type;
+-			info.subtype = je->i_ctt->subtype;
++			if(je->i_ctt)
++			{
++				info.ctype = je->i_ctt->type;
++				info.subtype = je->i_ctt->subtype;
++			}
++			else
++			{
++				info.ctype = NULL;
++				info.subtype = NULL;
++			}
+ 			info.to = je->local_uri;
+ 			info.from = je->remote_uri;
+ 			if (phcb->msgProgress != NULL)

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2007-08-20 16:08:44 UTC (rev 4172)
+++ wengophone/trunk/debian/patches/series	2007-08-20 21:18:37 UTC (rev 4173)
@@ -8,6 +8,7 @@
 generic/memory-dump-tmp-path.patch
 generic/portaudio-avoid-unnecessary-inclusion.patch
 generic/desktop-file-update.patch
+generic/phapi-fix-empty-ctype-dos.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-no-rpath_to_link_path.patch
 debian/cmake-force-fpic.patch




More information about the Pkg-voip-commits mailing list