[Pkg-citadel-commit] r137 - in citadel/trunk/debian: . patches

[dothebart-guest at alioth.debian.org]

Author: dothebart-guest
Date: 2008-08-27 17:58:25 +0000 (Wed, 27 Aug 2008)
New Revision: 137

Added:
   citadel/trunk/debian/patches/r6544_fix_qp_encoder_offbyone.diff
Modified:
   citadel/trunk/debian/changelog
   citadel/trunk/debian/patches/series
Log:
* add off by one fix. 


Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog	2008-08-26 06:42:15 UTC (rev 136)
+++ citadel/trunk/debian/changelog	2008-08-27 17:58:25 UTC (rev 137)
@@ -1,6 +1,7 @@
 citadel (7.37-3) unstable; urgency=low
 
   [ Wilfried Goesgens ]
+  * [r6544] add upstream prepatch; fix off by one in the QP encoder
   * remove use of tempfiles from migrate_aliases.sh, closes: #496359
   * [r6535] add upstream prepatch; stop the autopurger from messing with
     system rooms

Added: citadel/trunk/debian/patches/r6544_fix_qp_encoder_offbyone.diff
===================================================================
--- citadel/trunk/debian/patches/r6544_fix_qp_encoder_offbyone.diff	                        (rev 0)
+++ citadel/trunk/debian/patches/r6544_fix_qp_encoder_offbyone.diff	2008-08-27 17:58:25 UTC (rev 137)
@@ -0,0 +1,28 @@
+Index: msgbase.c
+===================================================================
+--- msgbase.c	(revision 6543)
++++ msgbase.c	(revision 6544)
+@@ -1517,12 +1517,12 @@
+ 	EncodedMaxLen = nColons * (sizeof(headerStr) + 3) + SourceLen * 3;
+ 	Encoded = (char*) malloc (EncodedMaxLen);
+ 
+-	for (i = 1; i <= nColons; i++)
++	for (i = 0; i < nColons; i++)
+ 		source[AddrPtr[i]++] = '\0';
+ 
+ 	nPtr = Encoded;
+ 	*nPtr = '\0';
+-	for (i = 0; i <= nColons && nPtr != NULL; i++) {
++	for (i = 0; i < nColons && nPtr != NULL; i++) {
+ 		nmax = EncodedMaxLen - (nPtr - Encoded);
+ 		if (AddrUtf8[i]) {
+ 			process_rfc822_addr(&source[AddrPtr[i]], 
+@@ -1560,7 +1560,7 @@
+ 			i--; /* do it once more with properly lengthened buffer */
+ 		}
+ 	}
+-	for (i = 1; i <= nColons; i++)
++	for (i = 0; i < nColons; i++)
+ 		source[--AddrPtr[i]] = ',';
+ 	free(AddrUtf8);
+ 	free(AddrPtr);

Modified: citadel/trunk/debian/patches/series
===================================================================
--- citadel/trunk/debian/patches/series	2008-08-26 06:42:15 UTC (rev 136)
+++ citadel/trunk/debian/patches/series	2008-08-27 17:58:25 UTC (rev 137)
@@ -6,3 +6,4 @@
 r6455_typo_mk_svnversion.diff
 r6529_no_tmp_files_migrate_aliases.sh.diff
 r6535_autopurger_dont_touch_systemfiles.diff
+r6544_fix_qp_encoder_offbyone.diff