svn commit: r291583 - head/usr.bin/rctl

[Edward Tomasz Napierala]

Author: trasz
Date: Tue Dec  1 14:02:14 2015
New Revision: 291583
URL: https://svnweb.freebsd.org/changeset/base/291583

Log:
  Fix rctl rule filters - eg the 'rctl -r :' case.
  
  MFC after:    1 month
  Sponsored by: The FreeBSD Foundation

Modified:
  head/usr.bin/rctl/rctl.c

Modified: head/usr.bin/rctl/rctl.c
==============================================================================
--- head/usr.bin/rctl/rctl.c    Tue Dec  1 13:20:21 2015        (r291582)
+++ head/usr.bin/rctl/rctl.c    Tue Dec  1 14:02:14 2015        (r291583)
@@ -111,22 +111,38 @@ parse_group(const char *s, id_t *gidp, c
  * Replace human-readable number with its expanded form.
  */
 static char *
-expand_amount(char *rule, const char *unexpanded_rule)
+expand_amount(const char *rule, const char *unexpanded_rule)
 {
        uint64_t num;
        const char *subject, *subject_id, *resource, *action, *amount, *per;
-       char *expanded;
+       char *copy, *expanded, *tofree;
        int ret;
 
-       subject = strsep(&rule, ":");
-       subject_id = strsep(&rule, ":");
-       resource = strsep(&rule, ":");
-       action = strsep(&rule, "=/");
-       amount = strsep(&rule, "/");
-       per = rule;
+       tofree = copy = strdup(rule);
+       if (copy == NULL) {
+               warn("strdup");
+               return (NULL);
+       }
 
-       if (amount == NULL || strlen(amount) == 0)
-               return (rule);
+       subject = strsep(&copy, ":");
+       subject_id = strsep(&copy, ":");
+       resource = strsep(&copy, ":");
+       action = strsep(&copy, "=/");
+       amount = strsep(&copy, "/");
+       per = copy;
+
+       if (amount == NULL || strlen(amount) == 0) {
+               /*
+                * The "copy" has already been tinkered with by strsep().
+                */
+               free(tofree);
+               copy = strdup(rule);
+               if (copy == NULL) {
+                       warn("strdup");
+                       return (NULL);
+               }
+               return (copy);
+       }
 
        assert(subject != NULL);
        assert(subject_id != NULL);
@@ -136,6 +152,7 @@ expand_amount(char *rule, const char *un
        if (expand_number(amount, &num)) {
                warnx("malformed rule '%s': invalid numeric value '%s'",
                    unexpanded_rule, amount);
+               free(tofree);
                return (NULL);
        }
 
@@ -149,9 +166,12 @@ expand_amount(char *rule, const char *un
 
        if (ret <= 0) {
                warn("asprintf");
+               free(tofree);
                return (NULL);
        }
 
+       free(tofree);
+
        return (expanded);
 }
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"