Changeset 34 for trunk/src/slib.c

Timestamp:

May 19, 2006, 8:09:51 PM (18 years ago)

Author:

rainer

Message:

Code cleanup and minor fixes

File:

• trunk/src/slib.c (modified) (3 diffs)

trunk/src/slib.c

@@ -7 +7 @@
 #include <string.h>
 #include <limits.h>
+#ifdef HAVE_STDINT_H
+/* for SIZE_MAX */
+#include <stdint.h>
+#endif
 
 #include <unistd.h>
@@ -2506 +2510 @@
  * ---------------------------------------------------------------- */
 
+#ifndef SIZE_MAX
+#define SIZE_MAX              (4294967295U)
+#endif
+
 int sl_ok_muli (int a, int b) /* a*b */
 {
-  if (a >= (INT_MIN / b) && a <= (INT_MAX / b))
+  if ((b == 0) || (a >= (INT_MIN / b) && a <= (INT_MAX / b)))
+    return SL_TRUE; /* no overflow */
+  return SL_FALSE;
+}
+
+int sl_ok_muls (size_t a, size_t b) /* a*b */
+{
+  if ((b == 0) || (a <= (SIZE_MAX / b)))
     return SL_TRUE; /* no overflow */
   return SL_FALSE;
@@ -2540 +2555 @@
 }
 
+int sl_ok_adds (size_t a, size_t b) /* a+b */
+{
+  if (a <= (SIZE_MAX - b))
+    return SL_TRUE; /* no overflow */
+  else
+    return SL_FALSE;
+}
+
 int sl_ok_subi (int a, int b) /* a-b */
 {