[libcxx] r229119 - Rooting out more undefined behavior in char_traits.
Marshall Clow
mclow.lists at gmail.com
Fri Feb 13 08:04:42 PST 2015
Author: marshall
Date: Fri Feb 13 10:04:42 2015
New Revision: 229119
URL: http://llvm.org/viewvc/llvm-project?rev=229119&view=rev
Log:
Rooting out more undefined behavior in char_traits.
Modified:
libcxx/trunk/include/string
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp
libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp
Modified: libcxx/trunk/include/string
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/string?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/include/string (original)
+++ libcxx/trunk/include/string Fri Feb 13 10:04:42 2015
@@ -639,16 +639,16 @@ struct _LIBCPP_TYPE_VIS_ONLY char_traits
{return __n == 0 ? 0 : memcmp(__s1, __s2, __n);}
static inline size_t length(const char_type* __s) {return strlen(__s);}
static inline const char_type* find(const char_type* __s, size_t __n, const char_type& __a)
- {return (const char_type*)memchr(__s, to_int_type(__a), __n);}
+ {return __n == 0 ? NULL : (const char_type*) memchr(__s, to_int_type(__a), __n);}
static inline char_type* move(char_type* __s1, const char_type* __s2, size_t __n)
- {return (char_type*)memmove(__s1, __s2, __n);}
+ {return __n == 0 ? __s1 : (char_type*) memmove(__s1, __s2, __n);}
static inline char_type* copy(char_type* __s1, const char_type* __s2, size_t __n)
{
_LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
- return (char_type*)memcpy(__s1, __s2, __n);
+ return __n == 0 ? __s1 : (char_type*)memcpy(__s1, __s2, __n);
}
static inline char_type* assign(char_type* __s, size_t __n, char_type __a)
- {return (char_type*)memset(__s, to_int_type(__a), __n);}
+ {return __n == 0 ? __s : (char_type*)memset(__s, to_int_type(__a), __n);}
static inline _LIBCPP_CONSTEXPR int_type not_eof(int_type __c) _NOEXCEPT
{return eq_int_type(__c, eof()) ? ~eof() : __c;}
@@ -685,16 +685,16 @@ struct _LIBCPP_TYPE_VIS_ONLY char_traits
static inline size_t length(const char_type* __s)
{return wcslen(__s);}
static inline const char_type* find(const char_type* __s, size_t __n, const char_type& __a)
- {return (const char_type*)wmemchr(__s, __a, __n);}
+ {return __n == 0 ? NULL : (const char_type*)wmemchr(__s, __a, __n);}
static inline char_type* move(char_type* __s1, const char_type* __s2, size_t __n)
- {return (char_type*)wmemmove(__s1, __s2, __n);}
+ {return __n == 0 ? __s1 : (char_type*)wmemmove(__s1, __s2, __n);}
static inline char_type* copy(char_type* __s1, const char_type* __s2, size_t __n)
{
_LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
- return (char_type*)wmemcpy(__s1, __s2, __n);
+ return __n == 0 ? __s1 : (char_type*)wmemcpy(__s1, __s2, __n);
}
static inline char_type* assign(char_type* __s, size_t __n, char_type __a)
- {return (char_type*)wmemset(__s, __a, __n);}
+ {return __n == 0 ? __s : (char_type*)wmemset(__s, __a, __n);}
static inline _LIBCPP_CONSTEXPR int_type not_eof(int_type __c) _NOEXCEPT
{return eq_int_type(__c, eof()) ? ~eof() : __c;}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/assign3.pass.cpp Fri Feb 13 10:04:42 2015
@@ -24,4 +24,5 @@ int main()
assert(s2[0] == char(5));
assert(s2[1] == char(5));
assert(s2[2] == char(5));
+ assert(std::char_traits<char>::assign(NULL, 0, char(5)) == NULL);
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/copy.pass.cpp Fri Feb 13 10:04:42 2015
@@ -24,4 +24,6 @@ int main()
assert(s2[0] == char(1));
assert(s2[1] == char(2));
assert(s2[2] == char(3));
+ assert(std::char_traits<char>::copy(NULL, s1, 0) == NULL);
+ assert(std::char_traits<char>::copy(s1, NULL, 0) == s1);
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/find.pass.cpp Fri Feb 13 10:04:42 2015
@@ -24,4 +24,5 @@ int main()
assert(std::char_traits<char>::find(s1, 3, char(3)) == s1+2);
assert(std::char_traits<char>::find(s1, 3, char(4)) == 0);
assert(std::char_traits<char>::find(s1, 3, char(0)) == 0);
+ assert(std::char_traits<char>::find(NULL, 0, char(0)) == 0);
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/move.pass.cpp Fri Feb 13 10:04:42 2015
@@ -28,4 +28,6 @@ int main()
assert(s1[0] == char(2));
assert(s1[1] == char(2));
assert(s1[2] == char(3));
+ assert(std::char_traits<char>::move(NULL, s1, 0) == NULL);
+ assert(std::char_traits<char>::move(s1, NULL, 0) == s1);
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign3.pass.cpp Fri Feb 13 10:04:42 2015
@@ -25,5 +25,6 @@ int main()
assert(s2[0] == char16_t(5));
assert(s2[1] == char16_t(5));
assert(s2[2] == char16_t(5));
+ assert(std::char_traits<char16_t>::assign(NULL, 0, char16_t(5)) == NULL);
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/copy.pass.cpp Fri Feb 13 10:04:42 2015
@@ -25,5 +25,7 @@ int main()
assert(s2[0] == char16_t(1));
assert(s2[1] == char16_t(2));
assert(s2[2] == char16_t(3));
+ assert(std::char_traits<char16_t>::copy(NULL, s1, 0) == NULL);
+ assert(std::char_traits<char16_t>::copy(s1, NULL, 0) == s1);
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/find.pass.cpp Fri Feb 13 10:04:42 2015
@@ -25,5 +25,6 @@ int main()
assert(std::char_traits<char16_t>::find(s1, 3, char16_t(3)) == s1+2);
assert(std::char_traits<char16_t>::find(s1, 3, char16_t(4)) == 0);
assert(std::char_traits<char16_t>::find(s1, 3, char16_t(0)) == 0);
+ assert(std::char_traits<char16_t>::find(NULL, 0, char16_t(0)) == 0);
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/move.pass.cpp Fri Feb 13 10:04:42 2015
@@ -29,5 +29,7 @@ int main()
assert(s1[0] == char16_t(2));
assert(s1[1] == char16_t(2));
assert(s1[2] == char16_t(3));
+ assert(std::char_traits<char16_t>::move(NULL, s1, 0) == NULL);
+ assert(std::char_traits<char16_t>::move(s1, NULL, 0) == s1);
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign3.pass.cpp Fri Feb 13 10:04:42 2015
@@ -25,5 +25,6 @@ int main()
assert(s2[0] == char32_t(5));
assert(s2[1] == char32_t(5));
assert(s2[2] == char32_t(5));
+ assert(std::char_traits<char32_t>::assign(NULL, 0, char32_t(5)) == NULL);
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/copy.pass.cpp Fri Feb 13 10:04:42 2015
@@ -25,5 +25,7 @@ int main()
assert(s2[0] == char32_t(1));
assert(s2[1] == char32_t(2));
assert(s2[2] == char32_t(3));
+ assert(std::char_traits<char32_t>::copy(NULL, s1, 0) == NULL);
+ assert(std::char_traits<char32_t>::copy(s1, NULL, 0) == s1);
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/find.pass.cpp Fri Feb 13 10:04:42 2015
@@ -25,5 +25,6 @@ int main()
assert(std::char_traits<char32_t>::find(s1, 3, char32_t(3)) == s1+2);
assert(std::char_traits<char32_t>::find(s1, 3, char32_t(4)) == 0);
assert(std::char_traits<char32_t>::find(s1, 3, char32_t(0)) == 0);
+ assert(std::char_traits<char32_t>::find(NULL, 0, char32_t(0)) == 0);
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/move.pass.cpp Fri Feb 13 10:04:42 2015
@@ -29,5 +29,7 @@ int main()
assert(s1[0] == char32_t(2));
assert(s1[1] == char32_t(2));
assert(s1[2] == char32_t(3));
+ assert(std::char_traits<char32_t>::move(NULL, s1, 0) == NULL);
+ assert(std::char_traits<char32_t>::move(s1, NULL, 0) == s1);
#endif // _LIBCPP_HAS_NO_UNICODE_CHARS
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/assign3.pass.cpp Fri Feb 13 10:04:42 2015
@@ -24,4 +24,5 @@ int main()
assert(s2[0] == wchar_t(5));
assert(s2[1] == wchar_t(5));
assert(s2[2] == wchar_t(5));
+ assert(std::char_traits<wchar_t>::assign(NULL, 0, wchar_t(5)) == NULL);
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/copy.pass.cpp Fri Feb 13 10:04:42 2015
@@ -24,4 +24,6 @@ int main()
assert(s2[0] == wchar_t(1));
assert(s2[1] == wchar_t(2));
assert(s2[2] == wchar_t(3));
+ assert(std::char_traits<wchar_t>::copy(NULL, s1, 0) == NULL);
+ assert(std::char_traits<wchar_t>::copy(s1, NULL, 0) == s1);
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/find.pass.cpp Fri Feb 13 10:04:42 2015
@@ -24,4 +24,5 @@ int main()
assert(std::char_traits<wchar_t>::find(s1, 3, wchar_t(3)) == s1+2);
assert(std::char_traits<wchar_t>::find(s1, 3, wchar_t(4)) == 0);
assert(std::char_traits<wchar_t>::find(s1, 3, wchar_t(0)) == 0);
+ assert(std::char_traits<wchar_t>::find(NULL, 0, wchar_t(0)) == 0);
}
Modified: libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp?rev=229119&r1=229118&r2=229119&view=diff
==============================================================================
--- libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp (original)
+++ libcxx/trunk/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.wchar.t/move.pass.cpp Fri Feb 13 10:04:42 2015
@@ -28,4 +28,6 @@ int main()
assert(s1[0] == wchar_t(2));
assert(s1[1] == wchar_t(2));
assert(s1[2] == wchar_t(3));
+ assert(std::char_traits<wchar_t>::move(NULL, s1, 0) == NULL);
+ assert(std::char_traits<wchar_t>::move(s1, NULL, 0) == s1);
}
More information about the cfe-commits
mailing list