From e41038ec40549443fbcc6925c36559dc0d644657 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Mon, 7 Feb 2000 03:11:43 +0000
Subject: [PATCH] (sec_read): more paranoia with return value from sec_get_data

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7874 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftp/security.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/appl/ftp/ftp/security.c b/appl/ftp/ftp/security.c
index 62bf3b45c..fb8295ecf 100644
--- a/appl/ftp/ftp/security.c
+++ b/appl/ftp/ftp/security.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -232,9 +232,12 @@ sec_read(int fd, void *data, int length)
     data = (char*)data + len;
     
     while(length){
-	if(sec_get_data(fd, &in_buffer, data_prot) < 0)
+	int ret;
+
+	ret = sec_get_data(fd, &in_buffer, data_prot);
+	if (ret < 0)
 	    return -1;
-	if(in_buffer.size == 0) {
+	if(ret == 0 || in_buffer.size == 0) {
 	    if(rx)
 		in_buffer.eof_flag = 1;
 	    return rx;