Răsfoiți Sursa

qdevice: Add safer wrapper of strtoll

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Jan Friesse 8 ani în urmă
părinte
comite
cefabecefd
4 a modificat fișierele cu 119 adăugiri și 4 ștergeri
  1. 3 2
      qdevices/Makefile.am
  2. 81 0
      qdevices/test-utils.c
  3. 31 1
      qdevices/utils.c
  4. 4 1
      qdevices/utils.h

+ 3 - 2
qdevices/Makefile.am

@@ -156,9 +156,9 @@ corosync-qdevice-net-certutil: corosync-qdevice-net-certutil.sh
 	    $< > $@
 
 TESTS				= qnetd-cluster-list.test dynar.test dynar-simple-lex.test \
-                                  dynar-getopt-lex.test process-list.test
+                                  dynar-getopt-lex.test process-list.test utils.test
 check_PROGRAMS			= qnetd-cluster-list.test dynar.test dynar-simple-lex.test \
-                                  dynar-getopt-lex.test process-list.test
+                                  dynar-getopt-lex.test process-list.test utils.test
 
 qnetd_cluster_list_test_SOURCES	= qnetd-cluster-list.c test-qnetd-cluster-list.c \
                                   qnetd-cluster.c qnetd-cluster.h \
@@ -172,5 +172,6 @@ dynar_simple_lex_test_SOURCES	= test-dynar-simple-lex.c dynar.c dynar-str.c dyna
 dynar_getopt_lex_test_SOURCES	= test-dynar-getopt-lex.c dynar.c dynar-str.c dynar-getopt-lex.c
 process_list_test_SOURCES	= test-process-list.c dynar.c dynar-str.c dynar-simple-lex.c \
                                   process-list.c
+utils_test_SOURCES		= test-utils.c utils.c
 
 endif

+ 81 - 0
qdevices/test-utils.c

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015-2018 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Jan Friesse (jfriesse@redhat.com)
+ *
+ * This software licensed under BSD license, the text of which follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * - Neither the name of the Red Hat, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived from this
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
+#include <errno.h>
+
+#include "utils.h"
+
+int
+main(void)
+{
+	long long int ll;
+	long long int lli;
+	char buf[32];
+
+	assert(utils_strtonum("0", 0, 100, &ll) == 0);
+	assert(ll == 0);
+
+	assert(utils_strtonum("100", 0, 100, &ll) == 0);
+	assert(ll == 100);
+
+	assert(utils_strtonum("101", 0, 100, &ll) != 0);
+	assert(utils_strtonum("0", 1, 100, &ll) != 0);
+
+	errno = ERANGE;
+	assert(utils_strtonum("10", 0, 100, &ll) == 0);
+	assert(ll == 10);
+
+	assert(utils_strtonum("-1", -1, 0, &ll) == 0);
+	assert(ll == -1);
+
+	assert(utils_strtonum("-10", -20, -10, &ll) == 0);
+	assert(ll == -10);
+
+	assert(utils_strtonum("0", 1, 0, &ll) == -1);
+
+	for (lli = -100; lli <= 100; lli++) {
+		assert(snprintf(buf, sizeof(buf), "%lld", lli) > 0);
+
+		assert(utils_strtonum(buf, -100, 100, &ll) == 0);
+		assert(ll == lli);
+	}
+
+	assert(utils_strtonum("test", -1000, 1000, &ll) == -1);
+	assert(utils_strtonum("12a", -1000, 1000, &ll) == -1);
+
+	return (0);
+}

+ 31 - 1
qdevices/utils.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Red Hat, Inc.
+ * Copyright (c) 2015-2018 Red Hat, Inc.
  *
  * All rights reserved.
  *
@@ -206,3 +206,33 @@ utils_fd_set_non_blocking(int fd)
 
 	return (0);
 }
+
+/*
+ * Safer wrapper of strtoll. Return 0 on success, otherwise -1.
+ */
+int
+utils_strtonum(const char *str, long long int min_val, long long int max_val,
+    long long int *res)
+{
+	long long int tmp_ll;
+	char *ep;
+
+	if (min_val > max_val) {
+		return (-1);
+	}
+
+	errno = 0;
+
+	tmp_ll = strtoll(str, &ep, 10);
+	if (ep == str || *ep != '\0' || errno != 0) {
+		return (-1);
+	}
+
+	if (tmp_ll < min_val || tmp_ll > max_val) {
+		return (-1);
+	}
+
+	*res = tmp_ll;
+
+	return (0);
+}

+ 4 - 1
qdevices/utils.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Red Hat, Inc.
+ * Copyright (c) 2015-2018 Red Hat, Inc.
  *
  * All rights reserved.
  *
@@ -62,6 +62,9 @@ extern void		utils_tty_detach(void);
 
 extern int		utils_fd_set_non_blocking(int fd);
 
+extern int		utils_strtonum(const char *str, long long int min_val,
+    long long int max_val, long long int *res);
+
 #ifdef __cplusplus
 }
 #endif