fix some memory leaks and a serialization bug

1 files changed, 6 insertions, 1 deletions

diff --git a/src/util.c b/src/util.c
index a349d5a..3da294b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -17,6 +17,7 @@
  */
 
 #include "globals.h"
+#include <sys/resource.h>
 
 void remove_cruft(char *str)
 {
@@ -90,7 +91,11 @@ room_id read_roomid(int fd)
 char *read_string(int fd)
 {
     size_t sz;
-    read(fd, &sz, sizeof(sz));
+    if(read(fd, &sz, sizeof(sz)) != sizeof(sz))
+    {
+        error("read_string: EOF");
+    }
+    debugf("sz is %d\n", sz);
     char *ret = malloc(sz + 1);
     if(read(fd, ret, sz) < 0)
     {