Attachment 825148 Details for Bug 1031384 – patch to correctly check match_rx return codes

[patch] patch to correctly check match_rx return codes

cronie-anacron-nodelay.rhel7.patch (text/plain), 1.59 KB, created by Martin Poole on 2013-11-17 14:06:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Poole

Created: 2013-11-17 14:06:46 UTC

Size: 1.59 KB

patch

obsolete

>diff -up cronie-1.4.11/anacron/readtab.c.nodelay cronie-1.4.11/anacron/readtab.c
>--- cronie-1.4.11/anacron/readtab.c.nodelay	2013-07-18 08:27:08.000000000 -0400
>+++ cronie-1.4.11/anacron/readtab.c	2013-11-17 08:48:37.534348179 -0500
>@@ -271,7 +271,8 @@ parse_tab_line(char *line)
>         if (strncmp(env_var, "START_HOURS_RANGE", 17) == 0)
>         {
>             r = match_rx("^([[:digit:]]+)-([[:digit:]]+)$", value, 2, &from, &to);
>-            if ((r == -1) || (from == NULL) || (to == NULL)) goto reg_invalid;
>+	    if (r == -1) goto reg_err;
>+	    if (r == 0) goto reg_invalid;
>             range_start = atoi(from);
>             range_stop = atoi(to);
>             if (range_stop < range_start) {
>@@ -282,14 +283,19 @@ parse_tab_line(char *line)
>         }
>         if (strncmp(env_var, "RANDOM_DELAY", 12) == 0) {
>             r = match_rx("^([[:digit:]]+)$", value, 0);
>-            if (r != -1) {
>-                int i = random();
>-                double x = 0;
>-                x = (double) i / (double) RAND_MAX * (double) (atoi(value));
>-                random_number = (int)x;
>+	    if (r == -1) goto reg_err;
>+	    if (r)
>+	    {
>+		random_number = 0;
>+		if (atoi(value) > 0) {
>+		    int i = random();
>+		    double x = 0;
>+		    x = (double) i / (double) RAND_MAX * (double) (atoi(value));
>+		    random_number = (int)x;
>+		}
>                 Debug(("Randomized delay set: %d", random_number));
>             }
>-        else goto reg_invalid;
>+	    else goto reg_invalid;
>         }
>         if (strncmp(env_var, "PREFERRED_HOUR", 14) == 0) {
>             r = match_rx("^([[:digit:]]+)$", value, 1, &pref_hour);

Actions: View | Diff

Attachments on bug 1031384: 825148 | 860082