generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avoid duplicate entries in add_cert_dir()

Browse Source 
PR: 1407
Submitted by: Tomas Mraz <tmraz@redhat.com>
This commit is contained in:
Nils Larsch 2006-12-05 21:21:37 +00:00
parent 10a10fb834
commit fa9ac569b8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/x509/by_dir.c
View File

@ -218,7 +218,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
s=dir; s=dir;
p=s; p=s;
for (;;) for (;;p++)
{ {
if ((*p == LIST_SEPARATOR_CHAR) || (*p == '\0')) if ((*p == LIST_SEPARATOR_CHAR) || (*p == '\0'))
{ {
@ -230,10 +230,12 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
for (j=0; j < sk_BY_DIR_ENTRY_num(ctx->dirs); j++) for (j=0; j < sk_BY_DIR_ENTRY_num(ctx->dirs); j++)
{ {
ent = sk_BY_DIR_ENTRY_value(ctx->dirs, j); ent = sk_BY_DIR_ENTRY_value(ctx->dirs, j);
if (strncmp(ent->dir,ss,(unsigned int)len) == 0) if (strlen(ent->dir) == len &&
continue; strncmp(ent->dir,ss,(unsigned int)len) == 0)
break;
} }
if (j < sk_BY_DIR_ENTRY_num(ctx->dirs))
continue;
if (ctx->dirs == NULL) if (ctx->dirs == NULL)
{ {
ctx->dirs = sk_BY_DIR_ENTRY_new_null(); ctx->dirs = sk_BY_DIR_ENTRY_new_null();
@ -264,7 +266,6 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
} }
if (*p == '\0') if (*p == '\0')
break; break;
p++;
} }
return 1; return 1;
} }