From 2db5c4c5f828b1e15e050931123a9fc3f222f290 Mon Sep 17 00:00:00 2001 From: stroeder Date: Fri, 6 Jan 2017 15:11:14 +0000 Subject: [PATCH] Fixed checking for empty server error message --- CHANGES | 5 +++-- Modules/errors.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 5f3c725..3b0bbe0 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,8 @@ Lib/ * Modules/ -* +* Fixed checking for empty server error message + (thanks to Bradley Baetz) ---------------------------------------------------------------- Released 2.4.28 2016-11-17 @@ -1307,4 +1308,4 @@ Released 2.0.0pre02 2002-02-01 ---------------------------------------------------------------- Released 1.10alpha3 2000-09-19 -$Id: CHANGES,v 1.399 2017/01/06 15:07:57 stroeder Exp $ +$Id: CHANGES,v 1.400 2017/01/06 15:11:14 stroeder Exp $ diff --git a/Modules/errors.c b/Modules/errors.c index ece438d..e3abeb5 100644 --- a/Modules/errors.c +++ b/Modules/errors.c @@ -2,7 +2,7 @@ * errors that arise from ldap use * Most errors become their own exception * See http://www.python-ldap.org/ for details. - * $Id: errors.c,v 1.25 2015/06/23 09:45:09 stroeder Exp $ */ + * $Id: errors.c,v 1.26 2017/01/06 15:11:14 stroeder Exp $ */ #include "common.h" #include "errors.h" @@ -98,7 +98,7 @@ LDAPerror( LDAP *l, char *msg ) Py_XDECREF(str); } else if (ldap_get_option(l, LDAP_OPT_ERROR_STRING, &error) >= 0 && error != NULL) { - if (error != '\0') { + if (*error != '\0') { str = PyString_FromString(error); if (str) PyDict_SetItemString( info, "info", str );