X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Foutput.c;h=1ddbd61ef683fb6d21f111d3393d78f6f1802324;hb=4b664cd6ce7792b58190cdcc92347ded44a8a46a;hp=787d75c749b4c69f5bd35f4f2b658929bf003cab;hpb=499c85dce538b5bb270bce62ba6c6911254f58a4;p=libsigrok.git

diff --git a/src/output/output.c b/src/output/output.c
index 787d75c7..1ddbd61e 100644
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libsigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@ extern SR_PRIV struct sr_output_module output_gnuplot;
 extern SR_PRIV struct sr_output_module output_chronovu_la8;
 extern SR_PRIV struct sr_output_module output_csv;
 extern SR_PRIV struct sr_output_module output_analog;
+extern SR_PRIV struct sr_output_module output_srzip;
 extern SR_PRIV struct sr_output_module output_wav;
 /* @endcond */
 
@@ -74,6 +75,7 @@ static const struct sr_output_module *output_module_list[] = {
 	&output_vcd,
 	&output_chronovu_la8,
 	&output_analog,
+	&output_srzip,
 	&output_wav,
 	NULL,
 };
@@ -170,9 +172,9 @@ SR_API const struct sr_option **sr_output_options_get(const struct sr_output_mod
 
 	mod_opts = o->options();
 
-	for (size = 1; mod_opts[size].id; size++)
+	for (size = 0; mod_opts[size].id; size++)
 		;
-	opts = g_malloc(size * sizeof(struct sr_option *));
+	opts = g_malloc((size + 1) * sizeof(struct sr_option *));
 
 	for (i = 0; i < size; i++)
 		opts[i] = &mod_opts[i];
@@ -274,7 +276,6 @@ SR_API const struct sr_output *sr_output_new(const struct sr_output_module *o,
 	}
 
 	if (op->module->init && op->module->init(op, new_opts) != SR_OK) {
-		g_hash_table_destroy(new_opts);
 		g_free(op);
 		op = NULL;
 	}