X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=blobdiff_plain;f=src%2Fssl-gnutls.c;fp=src%2Fssl-gnutls.c;h=8e3a825d2d4b5a1b9204748d23441b3dddb85e06;hp=5a44214e76f0fd5f1eeef0ab1afa100e83b4503c;hb=2e90aa50d776226ee9d7499e2e97fd22a1d6d3fe;hpb=7a59f41f662586056914dd3371b49b0eaaf676b6 diff --git a/src/ssl-gnutls.c b/src/ssl-gnutls.c index 5a44214..8e3a825 100644 --- a/src/ssl-gnutls.c +++ b/src/ssl-gnutls.c @@ -438,7 +438,7 @@ static int readcrtchain(struct certbuffer *ret, struct charbuf *pem) for(i = 0, p = NULL; i < sizeof(headers) / sizeof(*headers); i++) { f = memmem(pem->b, pem->d, headers[i], strlen(headers[i])); - if((p == NULL) || (f < p)) + if((f != NULL) && ((p == NULL) || (f < p))) p = f; } if(p == NULL) @@ -453,7 +453,7 @@ static int readcrtchain(struct certbuffer *ret, struct charbuf *pem) bufadd(*ret, crt); for(i = 0, p2 = NULL; i < sizeof(headers) / sizeof(*headers); i++) { f = memmem(p + 1, pem->d - (p + 1 - pem->b), headers[i], strlen(headers[i])); - if((p2 == NULL) || (f < p2)) + if((f != NULL) && ((p2 == NULL) || (f < p2))) p2 = f; } } while((p = p2) != NULL);