[Mixmaster-devel] rev 656 - in branches/mixmaster_2_9_STABLE/Mix: . Src

[<we...@so...>]

Author: weasel
Date: 2003-11-07 09:28:43 +0100 (Fri, 07 Nov 2003)
New Revision: 656

Modified:
   branches/mixmaster_2_9_STABLE/Mix/HISTORY
   branches/mixmaster_2_9_STABLE/Mix/Src/chain.c
Log:
Backport r493: Check that feedback buffer is not null before operating on it in chain_select()

Modified: branches/mixmaster_2_9_STABLE/Mix/HISTORY
===================================================================
--- branches/mixmaster_2_9_STABLE/Mix/HISTORY	2003-11-07 08:21:59 UTC (rev 655)
+++ branches/mixmaster_2_9_STABLE/Mix/HISTORY	2003-11-07 08:28:43 UTC (rev 656)
@@ -322,3 +322,6 @@
                              resulted in segfaults.
 
 2003-xx-xx      xxxxxx     Windows build changes.
+                           Check that feedback buffer is not null before
+                             operating on it in chain_select().
+                             Closes #631353, thanks Sami Farin.

Modified: branches/mixmaster_2_9_STABLE/Mix/Src/chain.c
===================================================================
--- branches/mixmaster_2_9_STABLE/Mix/Src/chain.c	2003-11-07 08:21:59 UTC (rev 655)
+++ branches/mixmaster_2_9_STABLE/Mix/Src/chain.c	2003-11-07 08:28:43 UTC (rev 656)
@@ -74,8 +74,10 @@
 	    break;
       }
       if (k < 0 || k >= maxrem) {
-	buf_appendf(feedback, "No such remailer: %b", selected);
-	buf_nl(feedback);
+	if (feedback != NULL) {
+		buf_appendf(feedback, "No such remailer: %b", selected);
+		buf_nl(feedback);
+	}
 #if 0
 	k = 0;
 #else /* end of 0 */
@@ -85,7 +87,9 @@
       }
       hop[len++] = k;
       if (len >= 20) {          /* array passed in is has length 20 */
-	buf_appends(feedback, "Chain too long.\n");
+	if (feedback != NULL) {
+		buf_appends(feedback, "Chain too long.\n");
+	}
 	break;
       }
       if (i > 0)