[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdebase/kdm/kfrontend [POSSIBLY UNSAFE]
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2003-02-21 15:32:52
[Download RAW message or body]

CVS commit by ossi: 

- don't explode on list separator ';'
- silence some warnings


  M +5 -7      genkdmconf.c   1.43.2.3 [POSSIBLY UNSAFE: scanf]


--- kdebase/kdm/kfrontend/genkdmconf.c  #1.43.2.2:1.43.2.3
@@ -1348,5 +1348,5 @@ mk_willing(Entry *ce, Section *cs ATTR_U
 
 static int
-edit_resources(File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED)
+edit_resources(File *file ATTR_UNUSED, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED)
 {
     /* XXX remove any login*, chooser*, ... resources */
@@ -1627,12 +1627,12 @@ upd_hiddenusers(Entry *ce, Section *cs A
 
     msu = getfqval (cs->name, "MinShowUID", "0");
-    sscanf (msu, "%d", &minuid);
+    sscanf (msu, "%u", &minuid);
     msu = getfqval (cs->name, "MaxShowUID", "65535");
-    sscanf (msu, "%d", &maxuid);
+    sscanf (msu, "%u", &maxuid);
 
     nv = 0;
     pt = ce->value;
     for (;;) {
-        et = strchr (pt, ',');
+        et = strpbrk (pt, ";,");
         if (et) {
             memcpy (nbuf, pt, et - pt);
@@ -2713,6 +2713,4 @@ static int
 mergeKdmRcNewer (const char *path)
 {
-    Section *cs;
-    Entry *ce;
     char *p, *p2;
 


[prev in list] [next in list] [prev in thread] [next in thread]