From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Wed, 16 Jul 2008 22:37:09 +0000 (+0000)
Subject: In the Windows version of tun_finalize, on errors that would
X-Git-Tag: v2.1_rc9~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb01ce0ba7e581963e5e06ff69038ca37635a79;p=thirdparty%2Fopenvpn.git

In the Windows version of tun_finalize, on errors that would
return -1, set buf->len to 0 rather than -1.  While downstream
code is set up to consider the buffer invalidated if its length
is <= 0, this change makes the code cleaner and safer.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3061 e7ae566f-a301-0410-adde-c780ea21d3b5
---

diff --git a/tun.c b/tun.c
index c1494d954..bc3466bd4 100644
--- a/tun.c
+++ b/tun.c
@@ -2033,7 +2033,12 @@ tun_finalize (
     }
 
   if (buf)
-    buf->len = ret;
+    {
+      if (ret < 0)
+	buf->len = 0;
+      else
+	buf->len = ret;
+    }
   return ret;
 }