Changeset 5d5eb43ff8df8e03fc18db124982db027cf4e271

Timestamp:

12/06/07 14:22:36 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1181650956 +0000

git-parent:

[bd7d0c0914a76376947111eb3eaba98abb71f05a]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1181650956 +0000

Message:

Fix potential memleaks

Files:

• modules/misc/freetype.c (modified) (5 diffs)

modules/misc/freetype.c

@@ -296 +296 @@
-        if( psz_fontfile ) free( psz_fontfile );
-        psz_fontfile = (char *)malloc( PATH_MAX + 1 );
+        if( !psz_fontfile )
+        {
+            msg_Err( p_filter, "out of memory" );
+            goto error;
+        }
-#ifdef WIN32
-        GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
@@ -862 +867 @@
-{
-    filter_sys_t *p_sys = p_filter->p_sys;
-0, *p_line = 0, *p_next = 0, *p_prev = 0
+NULL, *p_line = NULL, *p_next = NULL, *p_prev = NULL
-    int i, i_pen_y, i_pen_x, i_error, i_glyph_index, i_previous;
-0
+NULL
-    int i_string_length;
-    char *psz_string;
@@ -951 +956 @@
-
-        p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) );
+        if( !p_fribidi_string )
+        {
+            msg_Err( p_filter, "out of memory" );
+            goto error;
+        }
-
-        /* Do bidi conversion line-by-line */
@@ -1150 +1160 @@
-
-    p_new = malloc( sizeof( font_stack_t ) );
+    if( !p_new )
+        return VLC_ENOMEM;
+
-    p_new->p_next = NULL;
-
@@ -1280 +1293 @@
-
-        p_fribidi_string = malloc( (i_string_length + 1) * sizeof(uint32_t) );
+        if( !p_fribidi_string )
+        {
+            msg_Err( p_filter, "out of memory" );
+            free( psz_unicode );
+            return NULL;
+        }
-
-        /* Do bidi conversion line-by-line */