script: fix various memory leaks

coverity found a few leaks.

this commit mops them up.

diff --git a/src/plugins/splash/script/script-lib-image.c b/src/plugins/splash/script/script-lib-image.c
index a202702112ae92e4ad633741e42bf938eb527563..748e6d1e7a48d6c8d5a7239c552e7bc65d5bc976 100644 (file)
--- a/src/plugins/splash/script/script-lib-image.c
+++ b/src/plugins/splash/script/script-lib-image.c
@@ -200,7 +200,10 @@ static script_return_t image_text (script_state_t *state,
         }
         script_obj_unref (align_obj);
 
-        if (!text) return script_return_obj_null ();
+        if (!text) {
+                free (font);
+                return script_return_obj_null ();
+        }
 
         label = ply_label_new ();
         ply_label_set_text (label, text);

diff --git a/src/plugins/splash/script/script-lib-sprite.c b/src/plugins/splash/script/script-lib-sprite.c
index 206252b6fa073ebcc6e3591a42da52f69f83e748..211fe44729034d96b249ed4f8153e70e4a70cb17 100644 (file)
--- a/src/plugins/splash/script/script-lib-sprite.c
+++ b/src/plugins/splash/script/script-lib-sprite.c
@@ -741,12 +741,14 @@ void
 script_lib_sprite_refresh (script_lib_sprite_data_t *data)
 {
         ply_list_node_t *node;
-        ply_region_t *region = ply_region_new ();
+        ply_region_t *region;
         ply_list_t *rectable_list;
 
         if (!data)
             return;
 
+        region = ply_region_new ();
+
         ply_list_sort_stable (data->sprite_list, &sprite_compare_z);
 
         node = ply_list_get_first_node (data->sprite_list);

diff --git a/src/plugins/splash/script/script-parse.c b/src/plugins/splash/script/script-parse.c
index a4c7656e54c40ae7bd1ee66942d18d67d08db98f..ea5fdd24828a654579f37231caedb333fe413e67 100644 (file)
--- a/src/plugins/splash/script/script-parse.c
+++ b/src/plugins/splash/script/script-parse.c
@@ -54,6 +54,7 @@ static script_op_t *script_parse_op (script_scan_t *scan);
 static script_exp_t *script_parse_exp (script_scan_t *scan);
 static ply_list_t *script_parse_op_list (script_scan_t *scan);
 static void script_parse_op_list_free (ply_list_t *op_list);
+static void script_parse_exp_free (script_exp_t *exp);
 
 static script_exp_t *script_parse_new_exp (script_exp_type_t        type,
                                            script_debug_location_t *location)
@@ -225,10 +226,33 @@ static void script_parse_advance_scan_by_string (script_scan_t *scan,
         }
 }
 
+static void
+free_parameter_list (script_scan_t *scan,
+                     ply_list_t    *parameter_list)
+{
+        if (parameter_list != NULL) {
+                ply_list_node_t *node;
+
+                node = ply_list_get_first_node (parameter_list);
+                while (node != NULL) {
+                        ply_list_node_t *next_node;
+                        char *parameter;
+
+                        parameter = ply_list_node_get_data (node);
+                        next_node = ply_list_get_next_node (parameter_list, node);
+                        free (parameter);
+                        ply_list_remove_node (parameter_list, node);
+
+                        node = next_node;
+                }
+        }
+}
+
 static script_function_t *script_parse_function_def (script_scan_t *scan)
 {
         script_scan_token_t *curtoken = script_scan_get_current_token (scan);
-        ply_list_t *parameter_list;
+        script_function_t *function = NULL;
+        ply_list_t *parameter_list = NULL;
 
         if (!script_scan_token_is_symbol_of_value (curtoken, '(')) {
                 script_parse_error (&curtoken->location,
@@ -243,7 +267,7 @@ static script_function_t *script_parse_function_def (script_scan_t *scan)
                 if (!script_scan_token_is_identifier (curtoken)) {
                         script_parse_error (&curtoken->location,
                                             "Function declaration parameters must be valid identifiers");
-                        return NULL;
+                        goto out;
                 }
                 char *parameter = strdup (curtoken->data.string);
                 ply_list_append_data (parameter_list, parameter);
@@ -254,7 +278,7 @@ static script_function_t *script_parse_function_def (script_scan_t *scan)
                 if (!script_scan_token_is_symbol_of_value (curtoken, ',')) {
                         script_parse_error (&curtoken->location,
                                             "Function declaration parameters must separated with ',' and terminated with a ')'");
-                        return NULL;
+                        goto out;
                 }
                 curtoken = script_scan_get_next_token (scan);
         }
@@ -263,9 +287,12 @@ static script_function_t *script_parse_function_def (script_scan_t *scan)
 
         script_op_t *func_op = script_parse_op (scan);
 
-        script_function_t *function = script_function_script_new (func_op,
-                                                                  NULL,
-                                                                  parameter_list);
+        function = script_function_script_new (func_op,
+                                               NULL,
+                                               parameter_list);
+        parameter_list = NULL;
+out:
+        free_parameter_list (scan, parameter_list);
         return function;
 }
 
@@ -327,8 +354,18 @@ static script_exp_t *script_parse_exp_tm (script_scan_t *scan)
                         curtoken = script_scan_get_current_token (scan);
                         if (script_scan_token_is_symbol_of_value (curtoken, ']')) break;
                         if (!script_scan_token_is_symbol_of_value (curtoken, ',')) {
+                                ply_list_node_t *node;
                                 script_parse_error (&curtoken->location,
                                                     "Set parameters should be separated with a ',' and terminated with a ']'");
+
+
+                                for (node = ply_list_get_first_node (parameters);
+                                     node;
+                                     node = ply_list_get_next_node (parameters, node)) {
+                                        script_exp_t *sub = ply_list_node_get_data (node);
+                                        script_parse_exp_free (sub);
+                                }
+                                ply_list_free (parameters);
                                 return NULL;
                         }
                         curtoken = script_scan_get_next_token (scan);
@@ -377,8 +414,18 @@ static script_exp_t *script_parse_exp_pi (script_scan_t *scan)
                                 curtoken = script_scan_get_current_token (scan);
                                 if (script_scan_token_is_symbol_of_value (curtoken, ')')) break;
                                 if (!script_scan_token_is_symbol_of_value (curtoken, ',')) {
+                                        ply_list_node_t *node;
+
                                         script_parse_error (&curtoken->location,
                                                             "Function parameters should be separated with a ',' and terminated with a ')'");
+
+                                        for (node = ply_list_get_first_node (parameters);
+                                             node;
+                                             node = ply_list_get_next_node (parameters, node)) {
+                                                script_exp_t *sub = ply_list_node_get_data (node);
+                                                script_parse_exp_free (sub);
+                                        }
+                                        ply_list_free (parameters);
                                         return NULL;
                                 }
                                 curtoken = script_scan_get_next_token (scan);
@@ -992,6 +1039,7 @@ script_op_t *script_parse_file (const char *filename)
         curtoken = script_scan_get_current_token (scan);
         if (curtoken->type != SCRIPT_SCAN_TOKEN_TYPE_EOF) {
                 script_parse_error (&curtoken->location, "Unparsed characters at end of file");
+                script_parse_op_list_free (list);
                 return NULL;
         }
         script_op_t *op = script_parse_new_op_block (list, &location);
@@ -1015,6 +1063,7 @@ script_op_t *script_parse_string (const char *string,
         curtoken = script_scan_get_current_token (scan);
         if (curtoken->type != SCRIPT_SCAN_TOKEN_TYPE_EOF) {
                 script_parse_error (&curtoken->location, "Unparsed characters at end of file");
+                script_parse_op_list_free (list);
                 return NULL;
         }
         script_op_t *op = script_parse_new_op_block (list, &location);