From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 24 May 2010 21:45:56 +0000 (+0200)
Subject: Better checks in loops.
X-Git-Tag: gnutls_2_9_11~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ac6cdf377413eee0575703d847540ff074cd809;p=thirdparty%2Fgnutls.git

Better checks in loops.
---

diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index ad816082dd..4c4c35731a 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -2021,7 +2021,7 @@ _gnutls_x509_oid2sign_algorithm (const char *oid)
 {
   gnutls_sign_algorithm_t ret = 0;
 
-  GNUTLS_SIGN_LOOP (if (strcmp (oid, p->oid) == 0)
+  GNUTLS_SIGN_LOOP (if (p->oid && strcmp (oid, p->oid) == 0)
 		    {
 		    ret = p->id; break;}
   );
@@ -2241,7 +2241,7 @@ _gnutls_x509_oid2pk_algorithm (const char *oid)
   const gnutls_pk_entry *p;
 
   for (p = pk_algorithms; p->name != NULL; p++)
-    if (strcmp (p->oid, oid) == 0)
+    if (p->oid && strcmp (p->oid, oid) == 0)
       {
 	ret = p->id;
 	break;