From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 20 Mar 2014 12:14:11 +0000 (+0100)
Subject: Use VIR_STRNDUP instead of modifying the matched string
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=25c49db506271b3cef42df4ff010c08c4ec1ed18;p=libvirt.git

Use VIR_STRNDUP instead of modifying the matched string
---

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index acf63b320e..0795935d99 100644
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -2832,7 +2832,7 @@ virCommandRunRegex(virCommandPtr cmd,
         goto cleanup;
 
     for (k = 0; lines[k]; k++) {
-        char *p = NULL;
+        const char *p = NULL;
 
         /* ignore any command prefix */
         if (prefix)
@@ -2845,11 +2845,10 @@ virCommandRunRegex(virCommandPtr cmd,
             if (regexec(&reg[i], p, nvars[i]+1, vars, 0) != 0)
                 break;
 
-            /* NULL terminate each captured group in the line */
             for (j = 0; j < nvars[i]; j++) {
                 /* NB vars[0] is the full pattern, so we offset j by 1 */
-                p[vars[j+1].rm_eo] = '\0';
-                if (VIR_STRDUP(groups[ngroup++], p + vars[j+1].rm_so) < 0)
+                if (VIR_STRNDUP(groups[ngroup++], p + vars[j+1].rm_so,
+                                vars[j+1].rm_eo - vars[j+1].rm_so) < 0)
                     goto cleanup;
             }