X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Fsvg.c;h=2e9944ccd47bcd8306996fbba4e0a50e2825e607;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=bb7b78d414f88e04457c398cb073f7b6be6f8c62;hpb=e63c4f097e5868ba8d54c067d9cea59c850532b7;p=vlc

diff --git a/modules/misc/svg.c b/modules/misc/svg.c
index bb7b78d414..2e9944ccd4 100644
--- a/modules/misc/svg.c
+++ b/modules/misc/svg.c
@@ -24,8 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc( ), free( ) */
-#include <string.h>
 
 #include <vlc/vlc.h>
 #include <vlc_charset.h>
@@ -138,6 +136,7 @@ static int Create( vlc_object_t *p_this )
     if( !p_sys->psz_template )
     {
         msg_Err( p_filter, "out of memory" );
+        free( p_sys );
         return VLC_ENOMEM;
     }
 
@@ -145,6 +144,7 @@ static int Create( vlc_object_t *p_this )
     p_sys->i_height = p_filter->fmt_out.video.i_height;
 
     p_filter->pf_render_text = RenderText;
+    p_filter->pf_render_html = NULL;
     p_filter->p_sys = p_sys;
 
     /* MUST call this before any RSVG funcs */
@@ -161,7 +161,7 @@ static char *svg_GetTemplate( vlc_object_t *p_this )
     FILE *file;
 
     psz_filename = config_GetPsz( p_filter, "svg-template-file" );
-    if( !psz_filename || psz_filename[0] == 0 )
+    if( !psz_filename || (psz_filename[0] == 0) )
     {
         /* No filename. Use a default value. */
         psz_template = NULL;
@@ -413,8 +413,8 @@ static void svg_RenderPicture( filter_t *p_filter,
     rsvg_handle_set_size_callback( p_handle, svg_SizeCallback, p_filter, NULL );
 
     if( ! rsvg_handle_write( p_handle,
-			     ( guchar* )p_svg->psz_text, strlen( p_svg->psz_text ),
-			     &error ) ) 
+                 ( guchar* )p_svg->psz_text, strlen( p_svg->psz_text ),
+                 &error ) )
     {
         msg_Err( p_filter, "error while rendering SVG: %s\n", error->message );
         g_object_unref( G_OBJECT( p_handle ) );