Changeset e436cfe in mainline

Timestamp:

2008-10-02T07:49:38Z (16 years ago)

Author:

Tim Post <echo@…>

Branches:

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

Children:

c2ad500

Parents:

119c335

Message:

cli_redup() should be size_t and return as such to avoid undefined behavior with large strings.

Location:

uspace/app/bdsh

Files:

• util.c (modified) (2 diffs)
• util.h (modified) (1 diff)

uspace/app/bdsh/util.c

@@ -76 +76 @@
  * Return -1 on failure, or the length of the copied string on success.
  */
-int cli_redup(char **s1, const char *s2)
+size_t cli_redup(char **s1, const char *s2)
 {
         size_t len = strlen(s2) + 1;
@@ -93 +93 @@
         memcpy(*s1, s2, len);
         cli_errno = CL_EOK;
-        return (int) len;
+        return len;
 }
 

uspace/app/bdsh/util.h

@@ -6 +6 @@
 /* Internal string handlers */
 extern char * cli_strdup(const char *);
-extern int cli_redup(char **, const char *);
+extern size_t cli_redup(char **, const char *);
 extern int cli_psprintf(char **, const char *, ...);
 extern char * cli_strtok_r(char *, const char *, char **);