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:10 +00:00
parent 36abe6fe61
commit 66c4bb1a70
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/x509/by_dir.c
View File

@@ -189,7 +189,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'))
{ {
@@ -198,8 +198,11 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
len=(int)(p-ss); len=(int)(p-ss);
if (len == 0) continue; if (len == 0) continue;
for (j=0; j<ctx->num_dirs; j++) for (j=0; j<ctx->num_dirs; j++)
if (strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0) if (strlen(ctx->dirs[j]) == len &&
continue; strncmp(ctx->dirs[j],ss,(unsigned int)len) == 0)
break;
if (j<ctx->num_dirs)
continue;
if (ctx->num_dirs_alloced < (ctx->num_dirs+1)) if (ctx->num_dirs_alloced < (ctx->num_dirs+1))
{ {
ctx->num_dirs_alloced+=10; ctx->num_dirs_alloced+=10;
@@ -231,7 +234,6 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
ctx->num_dirs++; ctx->num_dirs++;
} }
if (*p == '\0') break; if (*p == '\0') break;
p++;
} }
return(1); return(1);
} }