Dont leak addrinfo in error path

[deb_libnfs.git] / lib / init.c

diff --git a/lib/init.c b/lib/init.c
index 45aa78da9f295acb92c5da2d333a53744801b170..936cc8b217884b95eea1587756cde3025bd4ac0a 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -24,9 +24,8 @@
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
 #include "slist.h"
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -82,7 +81,7 @@ void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
        if (rpc->auth != NULL) {
                auth_destroy(rpc->auth);
        }
-       rpc->auth = (AUTH *)auth;
+       rpc->auth = auth;
 }
 
 
@@ -120,6 +119,44 @@ void rpc_error_all_pdus(struct rpc_context *rpc, char *error)
        }
 }
 
+static void rpc_free_fragment(struct rpc_fragment *fragment)
+{
+       if (fragment->data != NULL) {
+               free(fragment->data);
+       }
+       free(fragment);
+}
+
+void rpc_free_all_fragments(struct rpc_context *rpc)
+{
+       while (rpc->fragments != NULL) {
+             struct rpc_fragment *fragment = rpc->fragments;
+
+             SLIST_REMOVE(&rpc->fragments, fragment);
+             rpc_free_fragment(fragment);
+       }
+}
+
+int rpc_add_fragment(struct rpc_context *rpc, char *data, uint64_t size)
+{
+       struct rpc_fragment *fragment;
+
+       fragment = malloc(sizeof(struct rpc_fragment));
+       if (fragment == NULL) {
+               return -1;
+       }
+
+       fragment->size = size;
+       fragment->data = malloc(fragment->size);
+       if(fragment->data == NULL) {
+               free(fragment);
+               return -1;
+       }
+
+       memcpy(fragment->data, data, fragment->size);
+       SLIST_ADD_END(&rpc->fragments, fragment);
+       return 0;
+}
 
 void rpc_destroy_context(struct rpc_context *rpc)
 {
@@ -136,6 +173,8 @@ void rpc_destroy_context(struct rpc_context *rpc)
                rpc_free_pdu(rpc, pdu);
        }
 
+       rpc_free_all_fragments(rpc);
+
        auth_destroy(rpc->auth);
        rpc->auth =NULL;