Blame SOURCES/gnutls-3.1.18-fix-crash-on-certain-names.patch
|
 |
6c6c5b |
From d3648ebb04b650e6d20a2ec1fb839256b30b9fc6 Mon Sep 17 00:00:00 2001
|
|
|
6c6c5b |
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
|
|
|
6c6c5b |
Date: Sun, 26 Jan 2014 20:03:50 +0100
|
|
|
6c6c5b |
Subject: [PATCH] fixed null pointer derefence when printing a name and an LDAP
|
|
|
6c6c5b |
description isn't present for the OID
|
|
|
6c6c5b |
|
|
|
6c6c5b |
Conflicts:
|
|
|
6c6c5b |
lib/x509/common.c
|
|
|
6c6c5b |
---
|
|
|
6c6c5b |
lib/x509/common.c | 4 ++--
|
|
|
6c6c5b |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
6c6c5b |
|
|
|
6c6c5b |
diff --git a/lib/x509/common.c b/lib/x509/common.c
|
|
|
6c6c5b |
index 59b7e93..f761b25 100644
|
|
|
6c6c5b |
--- a/lib/x509/common.c
|
|
|
6c6c5b |
+++ b/lib/x509/common.c
|
|
|
6c6c5b |
@@ -1,5 +1,5 @@
|
|
|
6c6c5b |
/*
|
|
|
6c6c5b |
- * Copyright (C) 2003-2012 Free Software Foundation, Inc.
|
|
|
6c6c5b |
+ * Copyright (C) 2003-2014 Free Software Foundation, Inc.
|
|
|
6c6c5b |
*
|
|
|
6c6c5b |
* Author: Nikos Mavrogiannopoulos
|
|
|
6c6c5b |
*
|
|
|
6c6c5b |
@@ -242,7 +242,7 @@ gnutls_x509_dn_oid_name (const char *oid, unsigned int flags)
|
|
|
6c6c5b |
|
|
|
6c6c5b |
do
|
|
|
6c6c5b |
{
|
|
|
6c6c5b |
- if (strcmp (_oid2str[i].oid, oid) == 0)
|
|
|
6c6c5b |
+ if (strcmp (_oid2str[i].oid, oid) == 0 && _oid2str[i].ldap_desc != NULL)
|
|
|
6c6c5b |
return _oid2str[i].ldap_desc;
|
|
|
6c6c5b |
i++;
|
|
|
6c6c5b |
}
|
|
|
6c6c5b |
--
|
|
|
6c6c5b |
1.9.0
|
|
|
6c6c5b |
|