Make sure memory is freed on errors in krb5_rc_io_fetch

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3284 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/rcache/rc_dfl.c b/src/lib/krb5/rcache/rc_dfl.c
index 7cec3df2d0c647fc20713e6c83e9fd59f4e85a19..87c4a1b712bd6d23de27a84b4e5a21cc9127d007 100644 (file)
--- a/src/lib/krb5/rcache/rc_dfl.c
+++ b/src/lib/krb5/rcache/rc_dfl.c
@@ -291,6 +291,8 @@ krb5_error_code krb5_rc_io_fetch(t, rep, maxlen)
 {
     int len;
     krb5_error_code retval;
+
+    rep->client = rep->server = 0;
     
     retval = krb5_rc_io_read (&t->d, (krb5_pointer) &len, sizeof(len));
     if (retval) 
@@ -304,29 +306,43 @@ krb5_error_code krb5_rc_io_fetch(t, rep, maxlen)
        return KRB5_RC_MALLOC;
     
     retval = krb5_rc_io_read (&t->d, (krb5_pointer) rep->client, len);
-    if (retval) 
-       return retval;
+    if (retval)
+       goto errout;
     
     retval = krb5_rc_io_read (&t->d, (krb5_pointer) &len, sizeof(len));
-    if (retval) 
-       return retval;
+    if (retval)
+       goto errout;
     
-    if ((len <= 0) || (len >= maxlen))
-       return KRB5_RC_IO_EOF;
+    if ((len <= 0) || (len >= maxlen)) {
+       retval = KRB5_RC_IO_EOF;
+       goto errout;
+    }
 
     rep->server = malloc (len);
-    if (!rep->server)
-       return KRB5_RC_MALLOC;
+    if (!rep->server) {
+       retval = KRB5_RC_MALLOC;
+       goto errout;
+    }
     
     retval = krb5_rc_io_read (&t->d, (krb5_pointer) rep->server, len);
-    if (retval) 
-       return retval;
+    if (retval)
+       goto errout;
     
     retval = krb5_rc_io_read (&t->d, (krb5_pointer) &rep->cusec, sizeof(rep->cusec));
     if (retval)
-       return retval;
+       goto errout;
     
     retval = krb5_rc_io_read (&t->d, (krb5_pointer) &rep->ctime, sizeof(rep->ctime));
+    if (retval)
+       goto errout;
+
+    return 0;
+    
+errout:
+    if (rep->client)
+       krb5_xfree(rep->client);
+    if (rep->server)
+       krb5_xfree(rep->server);
     return retval;
 }