[gimp] libgimp: add precondition checks for gimp_is_canonical_identifier()



commit f480d02823e2555a128f48baa8812b21b7dcb8f9
Author: Michael Natterer <mitch gimp org>
Date:   Sun Aug 18 12:43:37 2019 +0200

    libgimp: add precondition checks for gimp_is_canonical_identifier()
    
    on all procedure name parameters.

 libgimp/gimppdb.c          | 10 +++++-----
 libgimp/gimppdbprocedure.c |  2 +-
 libgimp/gimpplugin.c       |  6 +++---
 libgimp/gimpprocview.c     |  3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/libgimp/gimppdb.c b/libgimp/gimppdb.c
index 593a6614ac..890af4310d 100644
--- a/libgimp/gimppdb.c
+++ b/libgimp/gimppdb.c
@@ -140,7 +140,7 @@ gimp_pdb_procedure_exists (GimpPDB     *pdb,
                            const gchar *procedure_name)
 {
   g_return_val_if_fail (GIMP_IS_PDB (pdb), FALSE);
-  g_return_val_if_fail (procedure_name != NULL, FALSE);
+  g_return_val_if_fail (gimp_is_canonical_identifier (procedure_name), FALSE);
 
   return _gimp_pdb_proc_exists (procedure_name);
 }
@@ -167,7 +167,7 @@ gimp_pdb_lookup_procedure (GimpPDB     *pdb,
   GimpProcedure *procedure;
 
   g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
-  g_return_val_if_fail (procedure_name != NULL, NULL);
+  g_return_val_if_fail (gimp_is_canonical_identifier (procedure_name), NULL);
 
   procedure = g_hash_table_lookup (pdb->priv->procedures, procedure_name);
 
@@ -207,7 +207,7 @@ gimp_pdb_run_procedure (GimpPDB     *pdb,
   va_list         args;
 
   g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
-  g_return_val_if_fail (procedure_name != NULL, NULL);
+  g_return_val_if_fail (gimp_is_canonical_identifier (procedure_name), NULL);
 
   va_start (args, first_type);
 
@@ -244,7 +244,7 @@ gimp_pdb_run_procedure_valist (GimpPDB     *pdb,
   gchar          *error_msg = NULL;
 
   g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
-  g_return_val_if_fail (procedure_name != NULL, NULL);
+  g_return_val_if_fail (gimp_is_canonical_identifier (procedure_name), NULL);
 
   arguments = gimp_value_array_new_from_types_valist (&error_msg,
                                                       first_type,
@@ -293,7 +293,7 @@ gimp_pdb_run_procedure_array (GimpPDB              *pdb,
   GimpValueArray  *return_values;
 
   g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
-  g_return_val_if_fail (procedure_name != NULL, NULL);
+  g_return_val_if_fail (gimp_is_canonical_identifier (procedure_name), NULL);
   g_return_val_if_fail (arguments != NULL, NULL);
 
   proc_run.name    = (gchar *) procedure_name;
diff --git a/libgimp/gimppdbprocedure.c b/libgimp/gimppdbprocedure.c
index 1dc9057c26..0ef35e189c 100644
--- a/libgimp/gimppdbprocedure.c
+++ b/libgimp/gimppdbprocedure.c
@@ -187,7 +187,7 @@ _gimp_pdb_procedure_new (GimpPDB     *pdb,
   gint             i;
 
   g_return_val_if_fail (GIMP_IS_PDB (pdb), NULL);
-  g_return_val_if_fail (name != NULL, NULL);
+  g_return_val_if_fail (gimp_is_canonical_identifier (name), NULL);
 
   _gimp_pdb_proc_info (name,
                        &blurb,
diff --git a/libgimp/gimpplugin.c b/libgimp/gimpplugin.c
index c02be8ebc1..816eadf3e7 100644
--- a/libgimp/gimpplugin.c
+++ b/libgimp/gimpplugin.c
@@ -349,7 +349,7 @@ gimp_plug_in_create_procedure (GimpPlugIn  *plug_in,
                                const gchar *procedure_name)
 {
   g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), NULL);
-  g_return_val_if_fail (procedure_name != NULL, NULL);
+  g_return_val_if_fail (gimp_is_canonical_identifier (procedure_name), NULL);
 
   if (GIMP_PLUG_IN_GET_CLASS (plug_in)->create_procedure)
     return GIMP_PLUG_IN_GET_CLASS (plug_in)->create_procedure (plug_in,
@@ -414,7 +414,7 @@ gimp_plug_in_remove_temp_procedure (GimpPlugIn  *plug_in,
   GimpProcedure *procedure;
 
   g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
-  g_return_if_fail (procedure_name != NULL);
+  g_return_if_fail (gimp_is_canonical_identifier (procedure_name));
 
   procedure = gimp_plug_in_get_temp_procedure (plug_in, procedure_name);
 
@@ -468,7 +468,7 @@ gimp_plug_in_get_temp_procedure (GimpPlugIn  *plug_in,
   GList *list;
 
   g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), NULL);
-  g_return_val_if_fail (procedure_name != NULL, NULL);
+  g_return_val_if_fail (gimp_is_canonical_identifier (procedure_name), NULL);
 
   for (list = plug_in->priv->temp_procedures; list; list = g_list_next (list))
     {
diff --git a/libgimp/gimpprocview.c b/libgimp/gimpprocview.c
index a7a15db658..f315a7036f 100644
--- a/libgimp/gimpprocview.c
+++ b/libgimp/gimpprocview.c
@@ -32,6 +32,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "gimp.h"
@@ -97,7 +98,7 @@ gimp_proc_view_new (const gchar *procedure_name,
   const gchar     *type_str;
   gint             row;
 
-  g_return_val_if_fail (procedure_name != NULL, NULL);
+  g_return_val_if_fail (gimp_is_canonical_identifier (procedure_name), NULL);
 
   procedure = gimp_pdb_lookup_procedure (gimp_get_pdb (),
                                          procedure_name);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]