projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8fe4d5b
)
x509/by_dir.c: fix run-away pointer (and potential SEGV)
author
Andy Polyakov
<appro@openssl.org>
Mon, 24 Feb 2014 14:16:56 +0000
(15:16 +0100)
committer
Andy Polyakov
<appro@openssl.org>
Mon, 24 Feb 2014 14:24:14 +0000
(15:24 +0100)
when adding duplicates in add_cert_dir.
PR: 3261
Reported by: Marian Done
(cherry picked from commit
758954e0d8232d370ed72b7f86640e40443e1778
)
crypto/x509/by_dir.c
patch
|
blob
|
history
diff --git
a/crypto/x509/by_dir.c
b/crypto/x509/by_dir.c
index 27ca5150c195c46022a7d1d5ed57ac94350f6875..c6602dae4f58b88416a6d2cdbcbb4ab7d0868eaf 100644
(file)
--- a/
crypto/x509/by_dir.c
+++ b/
crypto/x509/by_dir.c
@@
-218,7
+218,7
@@
static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
s=dir;
p=s;
- for (;;p++)
+ do
{
if ((*p == LIST_SEPARATOR_CHAR) || (*p == '\0'))
{
@@
-264,9
+264,7
@@
static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
return 0;
}
}
- if (*p == '\0')
- break;
- }
+ } while (*p++ != '\0');
return 1;
}