From: Mathieu Rene <mrene@avgs.ca>
Date: Fri, 27 Feb 2009 15:38:33 +0000 (+0000)
Subject: Avoiding segfault
X-Git-Tag: v1.0.4~1783
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a58bdeac21a35fbe4485955af0a86a857a0c596a;p=thirdparty%2Ffreeswitch.git

Avoiding segfault

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12323 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/libs/esl/src/esl.c b/libs/esl/src/esl.c
index 5b2d197ba9..86dde31376 100644
--- a/libs/esl/src/esl.c
+++ b/libs/esl/src/esl.c
@@ -381,8 +381,8 @@ ESL_DECLARE(char *)esl_url_decode(char *s)
 static void sock_setup(esl_handle_t *handle)
 {
 #ifdef WIN32
-	BOOL bOptVal = TRUE;
-	int bOptLen = sizeof(BOOL);
+	BOOL bOptVal = TRUE;
+	int bOptLen = sizeof(BOOL);
 	setsockopt(handle->sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&bOptVal, bOptLen);
 #else
 	int x = 1;
@@ -712,7 +712,7 @@ ESL_DECLARE(esl_status_t) esl_recv_event_timed(esl_handle_t *handle, uint32_t ms
 	int max, activity;
 	esl_status_t status = ESL_SUCCESS;
 
-	if (!handle->connected) {
+	if (!handle->connected || !handle || handle->sock == -1) {
 		return ESL_FAIL;
 	}