Changeset ef06c74 in mod_gnutls for src/gnutls_util.c

Timestamp:

Jun 18, 2016, 3:18:36 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, master, proxy-ticket, upstream

Children:

f1147b6

Parents:

ac3f500

Message:

Compatibility code for GCC version < 5

The builtin_add_overflow() which is used for safe integer type
conversion was introduced with GCC 5, and thus unfortunately is not
available in Debian stable.

The "!defined(clang)" part in the version check is because Clang
3.8 has the builtin, but pretends to be GCC 4 as far as the GNUC
macro is concerned.

File:

• src/gnutls_util.c (modified) (1 diff)

src/gnutls_util.c

@@ -112 +112 @@
     apr_file_close(file);
 
-    /* safe integer type conversion */
+    /* safe integer type conversion: unsigned int and apr_size_t might
+     * have different sizes */
+#if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+    if (__builtin_expect(br > UINT_MAX, 0))
+        return APR_EINVAL;
+    else
+        datum->size = (unsigned int) br;
+#else
     if (__builtin_add_overflow(br, 0, &datum->size))
         return APR_EINVAL;
+#endif
 
     return rv;