projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79472df
)
In ssplit(), assert() that the last substring already is nul-terminated
author
Fabian Keil
<fk@fabiankeil.de>
Mon, 23 Jul 2012 12:46:40 +0000
(12:46 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Mon, 23 Jul 2012 12:46:40 +0000
(12:46 +0000)
ssplit.c
patch
|
blob
|
history
diff --git
a/ssplit.c
b/ssplit.c
index
348f535
..
9e1fd3d
100644
(file)
--- a/
ssplit.c
+++ b/
ssplit.c
@@
-1,4
+1,4
@@
-const char ssplit_rcs[] = "$Id: ssplit.c,v 1.1
7 2012/07/23 12:44:30
fabiankeil Exp $";
+const char ssplit_rcs[] = "$Id: ssplit.c,v 1.1
8 2012/07/23 12:46:18
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/ssplit.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/ssplit.c,v $
@@
-37,6
+37,7
@@
const char ssplit_rcs[] = "$Id: ssplit.c,v 1.17 2012/07/23 12:44:30 fabiankeil E
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
+#include <assert.h>
#include "ssplit.h"
#include "miscutil.h"
#include "ssplit.h"
#include "miscutil.h"
@@
-152,6
+153,8
@@
int ssplit(char *str, const char *delim, char *vec[], size_t vec_len)
}
}
/* null terminate the substring */
}
}
/* null terminate the substring */
+ /* XXX: this shouldn't be necessary, so assert that it isn't. */
+ assert(*str == '\0');
*str = '\0';
return(vec_count);
*str = '\0';
return(vec_count);