Attachment 921942 Details for Bug 1123625 – Final patch for htssafe.h

Final patch for htssafe.h

htssafe.h.patch (text/plain), 2.15 KB, created by Xavier Roche on 2014-07-28 21:12:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Roche

Created: 2014-07-28 21:12:27 UTC

Size: 2.15 KB

patch

obsolete

>Index: src/htssafe.h
>===================================================================
>--- src/htssafe.h	(revision 1290)
>+++ src/htssafe.h	(working copy)
>@@ -130,12 +130,24 @@
>  */
> #define strncatbuff(A, B, N) \
>   ( HTS_IS_NOT_CHAR_BUFFER(A) \
>-  ? strncat(A, B, N) \
>+  ? ( (N) != (size_t) -1 ? strncat(A, B, N) : strcat(A, B) ) \
>   : strncat_safe_(A, sizeof(A), B, \
>   HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B), N, \
>   "overflow while appending '" #B "' to '"#A"'", __FILE__, __LINE__) )
> 
> /**
>+ * Append characters of "B" to "A".
>+ * If "A" is a char[] variable whose size is not sizeof(char*), then the size 
>+ * is assumed to be the capacity of this array.
>+ */
>+#define strcatbuff(A, B) \
>+  ( HTS_IS_NOT_CHAR_BUFFER(A) \
>+  ? strcat(A, B) \
>+  : strncat_safe_(A, sizeof(A), B, \
>+  HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B), (size_t) -1, \
>+  "overflow while appending '" #B "' to '"#A"'", __FILE__, __LINE__) )
>+
>+/**
>  * Copy characters from "B" to "A".
>  * If "A" is a char[] variable whose size is not sizeof(char*), then the size 
>  * is assumed to be the capacity of this array.
>@@ -147,16 +159,7 @@
>   HTS_IS_NOT_CHAR_BUFFER(B) ? (size_t) -1 : sizeof(B), \
>   "overflow while copying '" #B "' to '"#A"'", __FILE__, __LINE__) )
> 
>-/* note: "size_t is an unsigned integral type" */
>-
> /**
>- * Append characters of "B" to "A".
>- * If "A" is a char[] variable whose size is not sizeof(char*), then the size 
>- * is assumed to be the capacity of this array.
>- */
>-#define strcatbuff(A, B) strncatbuff(A, B, (size_t) -1)
>-
>-/**
>  * Append characters of "B" to "A", "A" having a maximum capacity of "S".
>  */
> #define strlcatbuff(A, B, S) \
>@@ -188,6 +191,7 @@
>                                                  const char *exp, const char *file, int line) {
>   const size_t source_len = strlen_safe_(source, sizeof_source, file, line);
>   const size_t dest_len = strlen_safe_(dest, sizeof_dest, file, line);
>+  /* note: "size_t is an unsigned integral type" ((size_t) -1 is positive) */
>   const size_t source_copy = source_len <= n ? source_len : n;
>   const size_t dest_final_len = dest_len + source_copy;
>   assertf__(dest_final_len < sizeof_dest, exp, file, line);

Actions: View

Attachments on bug 1123625: 921437 | 921438 | 921439 | 921440 | 921441 | 921442 | 921443 | 921444 | 921445 | 921446 | 921928 | 921942