diff options
author | unknown <osku@127.(none)> | 2005-09-29 13:02:18 +0300 |
---|---|---|
committer | unknown <osku@127.(none)> | 2005-09-29 13:02:18 +0300 |
commit | b2d8eb02a7ee3fd6204ddbb037321b76f36db24e (patch) | |
tree | a9705f364c5027166020d94dd5da2f9092fb04a8 /innobase/include/ut0mem.h | |
parent | a5dd3d5d8f8e67cb74403f8265b9c61daf9d5ccd (diff) | |
download | mariadb-git-b2d8eb02a7ee3fd6204ddbb037321b76f36db24e.tar.gz |
InnoDB: Fix potential buffer underflow.
innobase/include/ut0mem.h:
Add ut_strlcpy_rev.
innobase/mem/mem0mem.c:
Use ut_strlcpy_rev instead of buggy own implementation.
innobase/ut/ut0mem.c:
Add ut_strlcpy_rev.
Diffstat (limited to 'innobase/include/ut0mem.h')
-rw-r--r-- | innobase/include/ut0mem.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h index 8f109a64b55..b9bbe0b5c92 100644 --- a/innobase/include/ut0mem.h +++ b/innobase/include/ut0mem.h @@ -122,6 +122,7 @@ ut_strcmp(const void* str1, const void* str2); Copies up to size - 1 characters from the NUL-terminated string src to dst, NUL-terminating the result. Returns strlen(src), so truncation occurred if the return value >= size. */ + ulint ut_strlcpy( /*=======*/ @@ -131,6 +132,18 @@ ut_strlcpy( ulint size); /* in: size of destination buffer */ /************************************************************************** +Like ut_strlcpy, but if src doesn't fit in dst completely, copies the last +(size - 1) bytes of src, not the first. */ + +ulint +ut_strlcpy_rev( +/*===========*/ + /* out: strlen(src) */ + char* dst, /* in: destination buffer */ + const char* src, /* in: source buffer */ + ulint size); /* in: size of destination buffer */ + +/************************************************************************** Compute strlen(ut_strcpyq(str, q)). */ UNIV_INLINE ulint |