Changeset ef06c74 in mod_gnutls

Timestamp:

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

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, main, 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.

Location:

src

Files:

• gnutls_ocsp.c (modified) (3 diffs)
• gnutls_util.c (modified) (1 diff)

src/gnutls_ocsp.c

@@ -393 +393 @@
      * (unsigned int) and fplen (size_t) may have different
      * lengths. */
+#if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+    if (__builtin_expect(fplen <= UINT_MAX, 1))
+    {
+        fingerprint.size = (unsigned int) fplen;
+        fingerprint.data = fp;
+    }
+#else
     if (__builtin_add_overflow(fplen, 0, &fingerprint.size))
         fingerprint.size = 0;
     else
         fingerprint.data = fp;
+#endif
     return fingerprint;
 }
@@ -541 +549 @@
     }
 
-    /* With the length restriction this really should not happen. */
+    /* With the length restriction this really should not overflow. */
+#if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+    if (__builtin_expect(len > UINT_MAX, 0))
+#else
     if (__builtin_add_overflow(len, 0, &response->size))
+#endif
     {
         response->data = NULL;
@@ -549 +561 @@
     else
     {
+#if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__)
+        response->size = (unsigned int) len;
+#endif
         response->data = apr_pmemdup(p, buf, len);
     }

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;