Changeset 989 for vendor/current/lib/replace

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

Location:

vendor/current/lib/replace

Files:

• replace.h (modified) (2 diffs)
• snprintf.c (modified) (2 diffs)

vendor/current/lib/replace/replace.h

@@ -426 +426 @@
 
 #ifndef PRINTF_ATTRIBUTE
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifdef HAVE___ATTRIBUTE__
 /** Use gcc attribute to check printf fns.  a1 is the 1-based index of
  * the parameter containing the format, and a2 the index of the first
@@ -438 +438 @@
 
 #ifndef _DEPRECATED_
-#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
+#ifdef HAVE___ATTRIBUTE__
 #define _DEPRECATED_ __attribute__ ((deprecated))
 #else

vendor/current/lib/replace/snprintf.c

@@ -805 +805 @@
         int signvalue = 0;
         unsigned LLONG uvalue;
-        char convert[20];
+        char convert[22+1]; /* 64-bit value in octal: 22 digits + \0 */
         int place = 0;
         int spadlen = 0; /* amount to space pad */
@@ -835 +835 @@
                         [uvalue % (unsigned)base  ];
                 uvalue = (uvalue / (unsigned)base );
-        } while(uvalue && (place < 20));
-        if (place == 20) place--;
+        } while(uvalue && (place < sizeof(convert)));
+        if (place == sizeof(convert)) place--;
         convert[place] = 0;