util_run_program(): skip multiple spaces in argv creation

[elogind.git] / libudev / libudev-util-private.c

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index dfde5a998d3413109239eb93cf77e0bf006eaed2..fb64c13229cfdb384c84ff8d51e4bdbd3bff2c0f 100644 (file)
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -269,10 +269,14 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
                                /* do not separate quotes */
                                pos++;
                                argv[i] = strsep(&pos, "\'");
                                /* do not separate quotes */
                                pos++;
                                argv[i] = strsep(&pos, "\'");

-                               while (pos != NULL && pos[0] == ' ')
-                                       pos++;
+                               if (pos != NULL)
+                                       while (pos[0] == ' ')
+                                               pos++;

                        } else {
                                argv[i] = strsep(&pos, " ");
                        } else {
                                argv[i] = strsep(&pos, " ");

+                               if (pos != NULL)
+                                       while (pos[0] == ' ')
+                                               pos++;

                        }
                        dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
                        i++;
                        }
                        dbg(udev, "arg[%i] '%s'\n", i, argv[i]);
                        i++;