Changeset 2c28bcbadce84f19b29350939eb9cd4af294c422

Timestamp:

20/08/08 23:22:22 (3 months ago)

Author:

Rémi Duraffort <ivoire@videolan.org>

git-committer:

Rémi Duraffort <ivoire@videolan.org> 1219267342 +0200

git-parent:

[131a15b62ba4440b80df480f9c56448a47785800]

git-author:

Rémi Duraffort <ivoire@videolan.org> 1219261335 +0200

Message:

Fix potential memleaks (free the module if it can't be loaded)

Files:

• modules/audio_filter/scaletempo.c (modified) (8 diffs)

modules/audio_filter/scaletempo.c

@@ -289 +289 @@
-    /* overlap */
-    unsigned frames_overlap = frames_stride * p->percent_overlap;
-
+
+
-        p->bytes_overlap    = 0;
-        p->bytes_standing   = p->bytes_stride;
-        p->samples_standing = p->bytes_standing / p->bytes_per_sample;
-        p->output_overlap   = NULL;
-
+
+
+
-        unsigned prev_overlap   = p->bytes_overlap;
-        p->bytes_overlap    = frames_overlap * p->bytes_per_frame;
@@ -302 +305 @@
-        p->buf_overlap      = malloc( p->bytes_overlap );
-        p->table_blend      = malloc( p->samples_overlap * 4 ); /* sizeof (int32|float) */
- p->buf_overlap || ! p->table_blend ) {
+p->buf_overlap || !p->table_blend )
-            return VLC_ENOMEM;
-
-
+
-            memset( (uint8_t *)p->buf_overlap + prev_overlap, 0, p->bytes_overlap - prev_overlap );
-
+
-        float *pb = p->table_blend;
-        float t = (float)frames_overlap;
-
+
+
-            float v = i / t;
- {
+
-                *pb++ = v;
-            }
-        }
-        p->output_overlap = output_overlap_float;
@@ -321 +323 @@
-    /* best overlap */
-    p->frames_search = ( frames_overlap <= 1 ) ? 0 : p->ms_search * p->sample_rate / 1000.0;
-
+
+
-        p->best_overlap_offset = NULL;
-
+
+
+
-        unsigned bytes_pre_corr = ( p->samples_overlap - p->samples_per_frame ) * 4; /* sizeof (int32|float) */
-        p->buf_pre_corr = malloc( bytes_pre_corr );
-        p->table_window = malloc( bytes_pre_corr );
- {
+
-            return VLC_ENOMEM;
-        }
-        float *pw = p->table_window;
-
+
+
-            float v = i * ( frames_overlap - i );
- {
+
-                *pw++ = v;
-            }
-        }
-        p->best_overlap_offset = best_overlap_offset_float;
@@ -341 +345 @@
-
-    unsigned new_size = ( p->frames_search + frames_stride + frames_overlap ) * p->bytes_per_frame;
-
-
+
+
+
+
-          p->bytes_to_slide -= p->bytes_queued;
-          p->bytes_queued    = 0;
-
+
+
+
-            unsigned new_queued = __MIN( p->bytes_queued - p->bytes_to_slide, new_size );
-            memmove( p->buf_queue,
@@ -356 +364 @@
-    p->bytes_queue_max = new_size;
-    p->buf_queue = malloc( p->bytes_queue_max );
- {
+
-        return VLC_ENOMEM;
-    }
-
-    p->bytes_stride_scaled  = p->bytes_stride * p->scale;
@@ -401 +408 @@
-
-    if( ! b_fit )
-    {
-        return VLC_EGENERIC;
-    }
-
-    p_filter->pf_do_work = DoWork;
@@ -411 +416 @@
-    p_sys = p_filter->p_sys = malloc( sizeof(aout_filter_sys_t) );
-    if( ! p_sys )
-    {
-        return VLC_ENOMEM;
-    }
-
-    p_sys->scale             = 1.0;
@@ -447 +450 @@
-    p_sys->bytes_to_slide = 0;
-    p_sys->frames_stride_error = 0;
-
+
+
+
+
+
+
+
-}
-