From: foobar <sniper@php.net>
Date: Mon, 6 Oct 2003 23:33:00 +0000 (+0000)
Subject: - Fixed bug #25764 (ldap_get_option() crashes when called with unbinded ldap link)
X-Git-Tag: RELEASE_1_3b3~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47484ce5d3a618563507b7e2c465a685628c1147;p=php

- Fixed bug #25764 (ldap_get_option() crashes when called with unbinded ldap link)
---

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 122b17285d..4d70b6d439 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -1663,13 +1663,20 @@ PHP_FUNCTION(ldap_get_option)
 	case LDAP_OPT_MATCHED_DN:
 #endif
 		{
-			char *val;
+			char *val = NULL;
+
 			if (ldap_get_option(ld->link, opt, &val)) {
 				RETURN_FALSE;
 			}
-			zval_dtor(*retval);
-			ZVAL_STRING(*retval, val, 1);
-			ldap_memfree(val);
+			if (val != NULL) {
+				if (*val != '\0') {
+					zval_dtor(*retval);
+					ZVAL_STRING(*retval, val, 1);
+				}
+				ldap_memfree(val);
+			} else {
+				RETURN_FALSE;
+			}
 		} break;
 /* options not implemented
 	case LDAP_OPT_SERVER_CONTROLS: