diff options
| author | David Benjamin <davidben@chromium.org> | 2015-01-26 03:04:47 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-01-26 21:37:47 +0300 |
| commit | 2a0e72f08a1990a41a279af8e885b345ae67d075 (patch) | |
| tree | fbf30db8659c4a54e5142f62d604e6d7918befb6 /include/openssl/conf.h | |
| parent | df1cda345f1cd60a13f4497e34a468b62f128a6f (diff) | |
Fix segfault with empty fields as last in the config.
(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>
Diffstat (limited to 'include/openssl/conf.h')
| -rw-r--r-- | include/openssl/conf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/conf.h b/include/openssl/conf.h index c67e023d..0918c0c5 100644 --- a/include/openssl/conf.h +++ b/include/openssl/conf.h @@ -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); |