clients/upslog.c: fix max loops CLI arg processing [#2753]

Signed-off-by: Jim Klimov <[email protected]>
networkupstools · Jan 5, 2025 · 1d8bf92 · 1d8bf92
1 parent 528f835
commit 1d8bf92
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/clients/upslog.c b/clients/upslog.c
@@ -506,7 +506,28 @@ int main(int argc, char **argv)
 				break;
 
 			case 'd':
-				str_to_ulong_strict(optarg, &max_loops, 10);
+				{	/* scoping */
+					unsigned long ul = 0;
+					if (str_to_ulong(optarg, &ul, 10)) {
+#if (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP) && ( (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TYPE_LIMITS) || (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TAUTOLOGICAL_CONSTANT_OUT_OF_RANGE_COMPARE) )
+# pragma GCC diagnostic push
+#endif
+#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TYPE_LIMITS
+# pragma GCC diagnostic ignored "-Wtype-limits"
+#endif
+#ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TAUTOLOGICAL_CONSTANT_OUT_OF_RANGE_COMPARE
+# pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
+						if (ul < SIZE_MAX)
+							max_loops = (size_t)ul;
+						else
+							upslogx(LOG_ERR, "Invalid max loops");
+#if (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP) && ( (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TYPE_LIMITS) || (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_TAUTOLOGICAL_CONSTANT_OUT_OF_RANGE_COMPARE) )
+# pragma GCC diagnostic pop
+#endif
+					} else
+						upslogx(LOG_ERR, "Invalid max loops");
+				}
 				break;
 
 			case 'f':