src/samplerate.c : Fix a valgrind warning which occured when the call back function returns a count of zero without modifying the pointer value.

Erik de Castro Lopo committed 18 years ago

Commit 2fd33ba1 parent 2df44c22 files · +14 −7Browse files

Unified · Split

2 files

@@ -1,3 +1,9 @@
		1	2008-07-10 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
		2
		3	* src/samplerate.c
		4	Fix a valgrind warning which occured when the call back function returns
		5	a count of zero without modifying the pointer value. Thanks to Paul Kelly.
		6
1	2008-07-09 Erik de Castro Lopo <erikd AT mega-nerd DOT com>	7	2008-07-09 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
2		8
3	* src/src_sinc.c	9	* src/src_sinc.c

 	if (data == NULL)
 		return SRC_ERR_BAD_DATA ;
-	/* Check src_ratio is in range. */
-	if (is_bad_src_ratio (data->src_ratio))
-		return SRC_ERR_BAD_SRC_RATIO ;
 	/* And that data_in and data_out are valid. */
 	if (data->data_in == NULL || data->data_out == NULL)
 		return SRC_ERR_BAD_DATA_PTR ;
-	if (data->data_in == NULL)
+	/* Check src_ratio is in range. */
-		data->input_frames = 0 ;
+	if (is_bad_src_ratio (data->src_ratio))
+		return SRC_ERR_BAD_SRC_RATIO ;
 	if (data->input_frames < 0)
 		data->input_frames = 0 ;
 	while (output_frames_gen < frames)
 	{
 		if (src_data.input_frames == 0)
-		{	float *ptr ;
+		{	/*	Use a dummy array for the case where the callback function
+			**	returns without setting the ptr.
+			*/
+			float dummy [1] ;
+			float *ptr = dummy ;
 			src_data.input_frames = psrc->callback_func (psrc->user_callback_data, &ptr) ;
 			src_data.data_in = ptr ;

Keyboard shortcuts