|
 |
304494 |
diff -up cronie-1.4.11/anacron/readtab.c.bla cronie-1.4.11/anacron/readtab.c
|
|
|
304494 |
--- cronie-1.4.11/anacron/readtab.c.bla 2013-07-18 14:27:08.000000000 +0200
|
|
|
304494 |
+++ cronie-1.4.11/anacron/readtab.c 2014-01-27 17:47:41.362138084 +0100
|
|
|
304494 |
@@ -271,7 +271,8 @@ parse_tab_line(char *line)
|
|
|
304494 |
if (strncmp(env_var, "START_HOURS_RANGE", 17) == 0)
|
|
|
304494 |
{
|
|
|
304494 |
r = match_rx("^([[:digit:]]+)-([[:digit:]]+)$", value, 2, &from, &to);
|
|
|
304494 |
- if ((r == -1) || (from == NULL) || (to == NULL)) goto reg_invalid;
|
|
|
304494 |
+ if (r == -1) goto reg_err;
|
|
|
304494 |
+ if (r == 0) goto reg_invalid;
|
|
|
304494 |
range_start = atoi(from);
|
|
|
304494 |
range_stop = atoi(to);
|
|
|
304494 |
if (range_stop < range_start) {
|
|
|
304494 |
@@ -282,6 +283,8 @@ parse_tab_line(char *line)
|
|
|
304494 |
}
|
|
|
304494 |
if (strncmp(env_var, "RANDOM_DELAY", 12) == 0) {
|
|
|
304494 |
r = match_rx("^([[:digit:]]+)$", value, 0);
|
|
|
304494 |
+ if (r == -1) goto reg_err;
|
|
|
304494 |
+ if (r == 0) goto reg_invalid;
|
|
|
304494 |
if (r != -1) {
|
|
|
304494 |
int i = random();
|
|
|
304494 |
double x = 0;
|
|
|
304494 |
@@ -289,7 +292,6 @@ parse_tab_line(char *line)
|
|
|
304494 |
random_number = (int)x;
|
|
|
304494 |
Debug(("Randomized delay set: %d", random_number));
|
|
|
304494 |
}
|
|
|
304494 |
- else goto reg_invalid;
|
|
|
304494 |
}
|
|
|
304494 |
if (strncmp(env_var, "PREFERRED_HOUR", 14) == 0) {
|
|
|
304494 |
r = match_rx("^([[:digit:]]+)$", value, 1, &pref_hour);
|