kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix segfault with empty fields as last in the config.

Browse Source 
(Imported from upstream's 2747d73c1466c487daf64a1234b6fe2e8a62ac75.)

Also fix up some stylistic issues in conf.c and clarify empty case in
documentation.

Change-Id: Ibacabfab2339d7566d51db4b3ac4579aec0d1fbf
Reviewed-on: https://boringssl-review.googlesource.com/3023
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-01-25 19:04:47 -05:00 committed by Adam Langley
parent df1cda345f
commit 2a0e72f08a
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crypto/conf/conf.c
View File

@ -715,27 +715,32 @@ int CONF_parse_list(const char *list, char sep, int remove_whitespace,
lstart = list;
for (;;) {
if (remove_whitespace) {
while (*lstart && isspace((unsigned char)*lstart))
while (*lstart && isspace((unsigned char)*lstart)) {
lstart++;
}
}
p = strchr(lstart, sep);
if (p == lstart || !*lstart)
if (p == lstart || !*lstart) {
ret = list_cb(NULL, 0, arg);
else {
if (p)
} else {
if (p) {
tmpend = p - 1;
else
} else {
tmpend = lstart + strlen(lstart) - 1;
}
if (remove_whitespace) {
while (isspace((unsigned char)*tmpend))
while (isspace((unsigned char)*tmpend)) {
tmpend--;
}
}
ret = list_cb(lstart, tmpend - lstart + 1, arg);
}
if (ret <= 0)
if (ret <= 0) {
return ret;
if (p == NULL)
}
if (p == NULL) {
return 1;
}
lstart = p + 1;
}
}

3
crypto/x509/asn1_gen.c
View File

@ -287,6 +287,9 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
int tmp_tag, tmp_class;
if (elem == NULL)
return 0;
for(i = 0, p = elem; i < len; p++, i++)
{
/* Look for the ':' in name value pairs */

3
include/openssl/conf.h
View File

@ -120,7 +120,8 @@ const char *NCONF_get_string(const CONF *conf, const char *section,
* the start and length of each member, optionally stripping leading and
* trailing whitespace. This can be used to parse comma separated lists for
* example. If |list_cb| returns <= 0, then the iteration is halted and that
* value is returned immediately. Otherwise it returns one. */
* value is returned immediately. Otherwise it returns one. Note that |list_cb|
* may be called on an empty member. */
int CONF_parse_list(const char *list, char sep, int remove_whitespace,
int (*list_cb)(const char *elem, int len, void *usr),
void *arg);