changes from feedback

Author: devnexen

sapi/fpm/fpm/fpm_unix.c

@@ -36,11 +36,9 @@
 #include <selinux/selinux.h>
 #endif
 
-#ifdef HAVE_SCHED_H
+#if defined(HAVE_SCHED_H)
 #include <sched.h>
-#endif
-
-#ifdef HAVE_SYS_CPUSET_H
+#elif defined(HAVE_SYS_CPUSET_H)
 #include <sys/cpuset.h>
 typedef cpuset_t cpu_set_t;
 #endif
@@ -449,21 +447,27 @@ static int fpm_cpuaffinity_set(cpu_set_t *c)
 
 static int fpm_setcpuaffinity(char *cpu_list)
 {
-	char *token, *buf;
+	char *token, *buf, *ptr;
     cpu_set_t c;
 	int r, cpumax, min, max;
 
 	r = -1;
 	cpumax = fpm_cpumax();
 
 	fpm_cpuaffinity_init(&c);
-	token = php_strtok_r(cpu_list, ",", &buf);
+	ptr = estrdup(cpu_list);
+	token = php_strtok_r(ptr, ",", &buf);
 
 	while (token) {
 		char *cpu_listsep;
 
+		if (!isdigit(*token)) {
+			return -1;
+		}
+
 		min = strtol(token, &cpu_listsep, 0);
-		if (errno || min < 0 || min > cpumax) {
+		if (errno || (*cpu_listsep != '\0' && *cpu_listsep != '-') || min < 0 || min > cpumax) {
+			efree(ptr);
 			return -1;
 		}
 		max = min;
@@ -472,19 +476,21 @@ static int fpm_setcpuaffinity(char *cpu_list)
 				char *err;
 				max = strtol(cpu_listsep + 1, &err, 0);
 				if (errno || *err != '\0' || max < min || max > cpumax) {
+					efree(ptr);
 					return -1;
 				}
 			} else {
+				efree(ptr);
 				return -1;
 			}
 		}
 
 		fpm_cpuaffinity_add(&c, min, max);
-
-		token = php_strtok_r(NULL, ";", &buf);
+		token = php_strtok_r(NULL, ",", &buf);
 	}
 
 	r = fpm_cpuaffinity_set(&c);
+	efree(ptr);
 	return r;
 }
 #endif