From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 15 Nov 2007 23:30:59 +0000 (+0000)
Subject: removed unnecessary check from add_buffer_send() that only was made within
X-Git-Tag: curl-7_18_0~273
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1125d45397972276ffbc27d9180e0faba10f139c;p=thirdparty%2Fcurl.git

removed unnecessary check from add_buffer_send() that only was made within
#ifdef CURL_DOES_CONVERSIONS anyway! I turned it into a DEBUGASSERT() instead.
---

diff --git a/lib/http.c b/lib/http.c
index e7b39ad4bb..eba69bdace 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -943,17 +943,17 @@ CURLcode add_buffer_send(send_buffer *in,
   ptr = in->buffer;
   size = in->size_used;
 
+  DEBUGASSERT(size - included_body_bytes > 0);
+
 #ifdef CURL_DOES_CONVERSIONS
-  if(size - included_body_bytes > 0) {
-    res = Curl_convert_to_network(conn->data, ptr, size - included_body_bytes);
-    /* Curl_convert_to_network calls failf if unsuccessful */
-    if(res != CURLE_OK) {
-      /* conversion failed, free memory and return to the caller */
-      if(in->buffer)
-        free(in->buffer);
-      free(in);
-      return res;
-    }
+  res = Curl_convert_to_network(conn->data, ptr, size - included_body_bytes);
+  /* Curl_convert_to_network calls failf if unsuccessful */
+  if(res != CURLE_OK) {
+    /* conversion failed, free memory and return to the caller */
+    if(in->buffer)
+      free(in->buffer);
+    free(in);
+    return res;
   }
 #endif /* CURL_DOES_CONVERSIONS */