Merge branch 'puzzles' into working

Change-Id: I66c3920266e141767b776203e0c4f0076260dadc

1 files changed, 61 insertions, 0 deletions

diff --git a/apps/plugins/puzzles/malloc.c b/apps/plugins/puzzles/malloc.c
new file mode 100644
index 0000000..d9943c6
--- /dev/null
+++ b/apps/plugins/puzzles/malloc.c
@@ -0,0 +1,61 @@
+/*
+ * malloc.c: safe wrappers around malloc, realloc, free, strdup
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "puzzles.h"
+
+/*
+ * smalloc should guarantee to return a useful pointer - Halibut
+ * can do nothing except die when it's out of memory anyway.
+ */
+
+int allocs = 0;
+int frees = 0;
+
+void *smalloc(size_t size) {
+    void *p;
+    p = malloc(size);
+    LOGF("allocs: %d", ++allocs);
+    if (!p)
+	fatal("out of memory");
+    return p;
+}
+
+/*
+ * sfree should guaranteeably deal gracefully with freeing NULL
+ */
+void sfree(void *p) {
+    if (p) {
+        ++frees;
+        LOGF("frees: %d, total outstanding: %d", frees, allocs - frees);
+	free(p);
+    }
+}
+
+/*
+ * srealloc should guaranteeably be able to realloc NULL
+ */
+void *srealloc(void *p, size_t size) {
+    void *q;
+    if (p) {
+	q = realloc(p, size);
+    } else {
+        LOGF("allocs: %d", ++allocs);
+	q = malloc(size);
+    }
+    if (!q)
+	fatal("out of memory");
+    return q;
+}
+
+/*
+ * dupstr is like strdup, but with the never-return-NULL property
+ * of smalloc (and also reliably defined in all environments :-)
+ */
+char *dupstr(const char *s) {
+    char *r = smalloc(1+strlen(s));
+    strcpy(r,s);
+    return r;
+}