X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=spxdec_filter.c;h=5aa78b44bf79314dda28e82a83f0153f63d35e6d;hp=41b66c519f9509d3837355854be95e8760f79648;hb=ebbea4043aa7c7f200e4f56c3bfa42f5c31f2e03;hpb=7584638594109184f329bead008f1dcdd9030767

diff --git a/spxdec_filter.c b/spxdec_filter.c
index 41b66c51..5aa78b44 100644
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (C) 2002-2006 Jean-Marc Valin
- * Copyright (C) 2010-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2010 Andre Noll <maan@tuebingen.mpg.de>
  *
- * Licensed under the GPL v2. For licencing details see COPYING.
+ * Licensed under the GPL v2, see file COPYING.
  */
 
 /** \file spxdec_filter.c Paraslash's ogg/speex decoder. */
@@ -43,7 +43,6 @@
 #include <regex.h>
 #include <ogg/ogg.h>
 #include <speex/speex.h>
-#include <stdbool.h>
 #include <speex/speex_header.h>
 #include <speex/speex_stereo.h>
 #include <speex/speex_callbacks.h>
@@ -51,7 +50,6 @@
 #include "para.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -76,7 +74,7 @@ struct private_spxdec_data {
 	int lookahead;
 	/** The state information about the current stream. */
 	ogg_stream_state os;
-	/** Whether \a os initialized. */
+	/** Whether \a os is initialized. */
 	bool stream_init;
 };
 
@@ -129,7 +127,14 @@ static int speexdec_init(struct filter_node *fn)
 #define le_short(s) ((short) (s))
 #endif
 
+/**
+ * Size of the output buffer.
+ *
+ * Valid streams have frame sizes in the range from 160 to 640. To avoid buffer
+ * overflows, we bail out if the decoder reports a value bigger than this.
+ */
 #define MAX_FRAME_SIZE 2000
+
 /* Copy Ogg packet to Speex bitstream */
 static int speexdec_write_frames(int packet_no,
 		struct private_spxdec_data *psd, int skip_samples,
@@ -140,7 +145,14 @@ static int speexdec_write_frames(int packet_no,
 	for (j = 0; j != psd->shi.nframes; j++) {
 		short output[MAX_FRAME_SIZE], *btr_output;
 		int skip = skip_samples + psd->lookahead, skip_idx = 0;
-		int samples, new_frame_size = psd->shi.frame_size;
+		int samples, this_frame_size,
+			new_frame_size = psd->shi.frame_size;
+
+		if (speex_decoder_ctl(psd->shi.state, SPEEX_GET_FRAME_SIZE,
+				&this_frame_size) == 0) {
+			if (this_frame_size > MAX_FRAME_SIZE)
+				return -E_SPX_DECODE_OVERFLOW;
+		};
 
 		if (speex_decode_int(psd->shi.state, &psd->bits, output) < 0)
 			return -E_SPX_DECODE;
@@ -239,9 +251,9 @@ static int compute_skip_samples(ogg_page *og, struct private_spxdec_data *psd)
 	return ret;
 }
 
-static void speexdec_post_select(__a_unused struct sched *s, struct task *t)
+static int speexdec_post_select(__a_unused struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct private_spxdec_data *psd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret, ns;
@@ -250,7 +262,6 @@ static void speexdec_post_select(__a_unused struct sched *s, struct task *t)
 	size_t nbytes;
 
 next_buffer:
-	t->error = 0;
 	ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	btr_merge(btrn, fn->min_iqs);
 	if (!psd->shi.state) {
@@ -291,22 +302,15 @@ next_buffer:
 		goto next_buffer;
 	ret = ns;
 fail:
-	if (ret < 0) {
-		t->error = ret;
-		btr_remove_node(btrn);
-	}
+	if (ret < 0)
+		btr_remove_node(&fn->btrn);
+	return ret;
 }
 
-/**
- * The init function of the ogg/speex decoder.
- *
- * \param f Its fields are filled in by the function.
- */
-void spxdec_filter_init(struct filter *f)
-{
-	f->open = spxdec_open;
-	f->close = speexdec_close;
-	f->pre_select = generic_filter_pre_select;
-	f->post_select = speexdec_post_select;
-	f->execute = speexdec_execute;
-}
+const struct filter lsg_filter_cmd_com_spxdec_user_data = {
+	.open = spxdec_open,
+	.close = speexdec_close,
+	.pre_select = generic_filter_pre_select,
+	.post_select = speexdec_post_select,
+	.execute = speexdec_execute,
+};