X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=sbr%2Fbrkstring.c;h=acbba6a96998baf5426568cff658a948ed967f09;hb=10eff860a28b96582526eb739fd0a55441669938;hp=68c7b70312c757a0a0fc6b565a717add4d17b535;hpb=b25e57753f3f4fb3fdde4240e0f617ef8dbea043;p=mmh

diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index 68c7b70..acbba6a 100644
--- a/sbr/brkstring.c
+++ b/sbr/brkstring.c
@@ -7,6 +7,7 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
 #include <h/utils.h>
 
@@ -29,7 +30,7 @@ brkstring(char *str, char *brksep, char *brkterm)
 	/* allocate initial space for pointers on first call */
 	if (!broken) {
 		len = NUMBROKEN;
-		broken = (char **)mh_xmalloc((size_t)(len * sizeof(*broken)));
+		broken = (char **)mh_xcalloc((size_t)len, sizeof(*broken));
 	}
 
 	/*
@@ -46,7 +47,7 @@ brkstring(char *str, char *brksep, char *brkterm)
 		}
 
 		/* handle separators */
-		while (strchr(brksep, c = *s)) {
+		while ((c=*s) && brksep && strchr(brksep, c)) {
 			*s++ = '\0';
 		}
 
@@ -54,7 +55,7 @@ brkstring(char *str, char *brksep, char *brkterm)
 		** we are either at the end of the string, or the
 		** terminator found has been found, so finish up.
 		*/
-		if (!c || strchr(brkterm, c)) {
+		if (!c || (brkterm && strchr(brkterm, c))) {
 			*s = '\0';
 			broken[i] = NULL;
 			return broken;
@@ -62,9 +63,14 @@ brkstring(char *str, char *brksep, char *brkterm)
 
 		/* set next start addr and walk over word */
 		broken[i] = s;
-		while ((c=*++s) && !strchr(brksep, c) && !strchr(brkterm, c)) {
-			continue;
+		while ((c = *++s)) {
+			if (brksep && strchr(brksep, c)) {
+				break;
+			}
+			if (brkterm && strchr(brkterm, c)) {
+				break;
+			}
 		}
 	}
-	adios("brkstring()", "reached unreachable point");
+	adios(EX_SOFTWARE, "brkstring()", "reached unreachable point");
 }