[Openvas-commits] r2630 - in trunk/openvas-client: . nessus/prefs_dialog

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-03-02 11:55:46 +0100 (Mon, 02 Mar 2009)
New Revision: 2630

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c
Log:
* nessus/prefs_dialog/prefs_dialog.c (set_yesno_pref_from_toggle,
prefs_dialog_apply_plugin_prefs, arg_int_to_yesno): Added
RATS ignores where strlen is called on string literals.

* nessus/prefs_dialog/prefs_dialog.c (prefs_dialog_apply): Use estrdup
instead of malloc and snprintf.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-03-02 10:32:53 UTC (rev 2629)
+++ trunk/openvas-client/ChangeLog	2009-03-02 10:55:46 UTC (rev 2630)
@@ -1,5 +1,14 @@
 2009-03-02  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
+	* nessus/prefs_dialog/prefs_dialog.c (set_yesno_pref_from_toggle,
+	prefs_dialog_apply_plugin_prefs, arg_int_to_yesno): Added
+	RATS ignores where strlen is called on string literals.
+	
+	* nessus/prefs_dialog/prefs_dialog.c (prefs_dialog_apply): Use estrdup
+	instead of malloc and snprintf.
+
+2009-03-02  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
 	* nessus/prefs_dialog/prefs_dialog_scan_opts.c: Tranformed doc blocks,
 	K&R style replacements.
 

Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c
===================================================================
--- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c	2009-03-02 10:32:53 UTC (rev 2629)
+++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog.c	2009-03-02 10:55:46 UTC (rev 2630)
@@ -856,7 +856,7 @@
       char *s = strdup(v ? "yes" : "no");
 
       arg_set_type(serv, "auto_enable_dependencies", ARG_STRING);
-      arg_set_value(serv, "auto_enable_dependencies", strlen(s), s);
+      arg_set_value(serv, "auto_enable_dependencies", strlen(s), s); /* RATS: ignore s is yes or no and nul terminated */
       v = s;
     }
     if(v && !strcmp(v, "yes"))
@@ -873,7 +873,7 @@
       char *s = strdup(v ? "yes" : "no");
 
       arg_set_type(serv, "silent_dependencies", ARG_STRING);
-      arg_set_value(serv, "silent_dependencies", strlen(s), s);
+      arg_set_value(serv, "silent_dependencies", strlen(s), s); /* RATS: ignore s is yes or no and nul terminated */
       v = s;
     }
     if(v && !strcmp(v, "yes"))
@@ -1233,9 +1233,7 @@
 
   t = arg_get_value(ctrls, "SCAN_OPTIONS");
   gtkw = arg_get_value(t, "PORT_RANGE");
-  s = emalloc(strlen(gtk_entry_get_text(GTK_ENTRY(gtkw))) + 1);
-  strncpy(s, gtk_entry_get_text(GTK_ENTRY(gtkw)),
-      strlen(gtk_entry_get_text(GTK_ENTRY(gtkw))));
+  s = estrdup (gtk_entry_get_text(GTK_ENTRY(gtkw)));
 
   if(arg_get_value(serv, "port_range"))
     arg_set_value(serv, "port_range", strlen(s), s);
@@ -1249,11 +1247,8 @@
 
   gtkw = arg_get_value(t, "MAX_HOSTS");
 
-  s = emalloc(strlen(gtk_entry_get_text(GTK_ENTRY(gtkw))) + 1);
+  s = estrdup (gtk_entry_get_text(GTK_ENTRY(gtkw)));
 
-  strncpy(s, gtk_entry_get_text(GTK_ENTRY(gtkw)),
-      strlen(gtk_entry_get_text(GTK_ENTRY(gtkw))));
-
   if(arg_get_value(serv, "max_hosts"))
     arg_set_value(serv, "max_hosts", strlen(s), s);
   else
@@ -1262,11 +1257,8 @@
 
   gtkw = arg_get_value(t, "MAX_CHECKS");
 
-  s = emalloc(strlen(gtk_entry_get_text(GTK_ENTRY(gtkw))) + 1);
+  s = g_strdup (gtk_entry_get_text(GTK_ENTRY(gtkw)));
 
-  strncpy(s, gtk_entry_get_text(GTK_ENTRY(gtkw)),
-      strlen(gtk_entry_get_text(GTK_ENTRY(gtkw))));
-
   if(arg_get_value(serv, "max_checks"))
     arg_set_value(serv, "max_checks", strlen(s), s);
   else
@@ -1420,8 +1412,7 @@
 	    {
 	      char *value =
 		  GTK_TOGGLE_BUTTON(button)->active ? "yes" : "no";
-	      arg_set_value(pref->value, "value", strlen(value),
-		  estrdup(value));
+	      arg_set_value(pref->value, "value", strlen(value), estrdup(value)); /* RATS: ignore , value is yes or no and nul- terminated */
 	    }
 	  }
 	  else if(!strcmp(type, PREF_RADIO))
@@ -1442,7 +1433,7 @@
           {
             // Workaround to trigger display of this NVT (otherwise invisible 
             // when not connected)
-            arg_set_value(pref->value, "value", strlen("ignored"), "ignored");
+            arg_set_value(pref->value, "value", strlen("ignored"), "ignored"); /* RATS: ignore string literals are nul terminated */
           }
 	}
 	pref = pref->next;