[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec dv.c,1.62,1.63

Michael Niedermayer CVS michael
Fri Aug 26 17:41:31 CEST 2005


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv6416

Modified Files:
	dv.c 
Log Message:
Fix for memleak in dv.c patch by (Burkhard Plaum; plaum, ipf uni-stuttgart de)


Index: dv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dv.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- dv.c	11 Aug 2005 01:28:04 -0000	1.62
+++ dv.c	26 Aug 2005 15:41:28 -0000	1.63
@@ -109,14 +109,13 @@
 
         done = 1;
 
-        dv_vlc_map = av_mallocz(DV_VLC_MAP_LEV_SIZE*DV_VLC_MAP_RUN_SIZE*sizeof(struct dv_vlc_pair));
+        dv_vlc_map = av_mallocz_static(DV_VLC_MAP_LEV_SIZE*DV_VLC_MAP_RUN_SIZE*sizeof(struct dv_vlc_pair));
 	if (!dv_vlc_map)
 	    return -ENOMEM;
 
 	/* dv_anchor lets each thread know its Id */
 	dv_anchor = av_malloc(12*27*sizeof(void*));
 	if (!dv_anchor) {
-	    av_free(dv_vlc_map);
 	    return -ENOMEM;
 	}
 	for (i=0; i<12*27; i++)
@@ -149,7 +148,6 @@
         dv_rl_vlc = av_malloc(dv_vlc.table_size * sizeof(RL_VLC_ELEM));
 	if (!dv_rl_vlc) {
 	    av_free(dv_anchor);
-	    av_free(dv_vlc_map);
 	    return -ENOMEM;
 	}
         for(i = 0; i < dv_vlc.table_size; i++){





More information about the ffmpeg-cvslog mailing list