Changeset 6700ee2 in mainline for kernel/generic/src/lib/string.c

Timestamp:

2009-04-14T19:31:12Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

17646b1

Parents:

4482bc7

Message:

Forbid destination string buffers of size zero altogether as they most probably indicate programming error.

File:

• kernel/generic/src/lib/string.c (modified) (6 diffs)

kernel/generic/src/lib/string.c

@@ -109 +109 @@
 #include <errno.h>
 #include <align.h>
+#include <debug.h>
 
 /** Byte mask consisting of lowest @n bits (out of 8) */
@@ -537 +538 @@
  *
  * @param dst   Destination buffer.
- * @param count Size of the destination buffer.
+ * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
  */
@@ -546 +547 @@
         size_t dest_off;
 
-        /* No space for the NULL-terminator in the buffer. */
-        if (size == 0)
-                return;
+        /* There must be space for a null terminator in the buffer. */
+        ASSERT(size > 0);
         
         src_off = 0;
@@ -563 +563 @@
 /** Copy size-limited substring.
  *
- * Copy source string @a src to destination buffer @a dest.
- * No more than @a size bytes are written. If the size of the output buffer
- * is at least one byte, the output string will always be well-formed, i.e.
- * null-terminated and containing only complete characters.
+ * Copy prefix of string @a src of max. size @a size to destination buffer
+ * @a dest. No more than @a size bytes are written. The output string will
+ * always be well-formed, i.e. null-terminated and containing only complete
+ * characters.
  *
  * No more than @a n bytes are read from the input string, so it does not
@@ -572 +572 @@
  *
  * @param dst   Destination buffer.
- * @param count Size of the destination buffer.
+ * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
+ * @param n     Maximum number of bytes to read from @a src.
  */
 void str_ncpy(char *dest, size_t size, const char *src, size_t n)
@@ -581 +582 @@
         size_t dest_off;
 
-        /* No space for the null terminator in the buffer. */
-        if (size == 0)
-                return;
+        /* There must be space for a null terminator in the buffer. */
+        ASSERT(size > 0);
         
         src_off = 0;