Skip to contentSkip to conversation

xl: Fix adding additional config cmdline parameters

PATCH New Andre Przywara 1 participant 1 message Sep 10, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 xl: Fix adding additional config cmdline parameters

Hi,

when checking the size of the buffer we hold for additional config parameters passed on the command line we should take the size of the to-be-added string into account. While at it, rework the implementation to be cleaner and safer.

Regards,
Andre.

Signature · 3 lines
Andre Przywara
AMD-Operating System Research Center (OSRC), Dresden, Germany
Tel: +49 351 448-3567-12

commit bc37ac1bedc704293117b9e3e50f18042c4e8254

Author: Andre Przywara <[email protected]>
Date:   Fri Sep 10 14:26:55 2010 +0200

Improve adding additional config cmdline parameters

When checking the size of the buffer we hold for additional config parameters passed on the command line we should take the size of the to-be-added string into account. While at it, rework the implementation to be cleaner and safer.

tools/libxl/xl_cmdimpl.c +5 -9
index f40de2b..8fe4e08 100644
@@ -3251,21 +3251,17 @@ int main_create(int argc, char **argv)
         }
     }
 
-    memset(extra_config, 0, sizeof(extra_config));
-    while (optind < argc) {
-        if ((p = strchr(argv[optind], '='))) {
-            if (strlen(extra_config) + 1 < sizeof(extra_config)) {
-                if (strlen(extra_config))
-                    strcat(extra_config, "\n");
-                strcat(extra_config, argv[optind]);
-            }
+    extra_config[0] = '\0';
+    for (p = extra_config; optind < argc; optind++) {
+        if (strchr(argv[optind], '=') != NULL) {
+            p += snprintf(p, sizeof(extra_config) - (p - extra_config),
+                "%s\n", argv[optind]);
         } else if (!filename) {
             filename = argv[optind];
         } else {
             help("create");
             return 2;
         }
-        optind++;
     }
 
     memset(&dom_info, 0, sizeof(dom_info));

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel