(xalloc): New function.

(main): Use xalloc.

Rev: src/nettle/tools/sexp-conv.c:1.15

diff --git a/tools/sexp-conv.c b/tools/sexp-conv.c
index 0d6140634f5b744c78a523b4079f056e17b2d5f0..d4b152b673028488d1fabf45b992deafc1dc6ef8 100644 (file)
--- a/tools/sexp-conv.c
+++ b/tools/sexp-conv.c
@@ -44,6 +44,19 @@
 
 #define BUG_ADDRESS "nettle-bugs@lists.lysator.liu.se"
 
+static void *
+xalloc(size_t size)
+{
+  void *p = malloc(size);
+  if (!p)
+    {
+      fprintf(stderr, "Virtual memory exhausted.\n");
+      abort();
+    }
+
+  return p;
+}
+
 \f
 /* Conversion functions. */
 
@@ -318,7 +331,7 @@ main(int argc, char **argv)
   struct sexp_parser parser;
   struct sexp_compound_token token;
   struct sexp_output output;
-  
+
   parse_options(&options, argc, argv);
 
   sexp_input_init(&input, stdin);
@@ -328,9 +341,11 @@ main(int argc, char **argv)
                   options.width, options.prefer_hex);
 
   if (options.hash)
-    sexp_output_hash_init(&output,
-                         options.hash,
-                         alloca(options.hash->context_size));
+    {
+      /* Leaks the context, but that doesn't matter */
+      void *ctx = xalloc(options.hash->context_size);
+      sexp_output_hash_init(&output, options.hash, ctx);
+    }
   
   sexp_get_char(&input);