mirror/ctemplate
1
0
Fork 0
mirror of https://github.com/OlafvdSpek/ctemplate.git synced 2025-10-05 19:16:54 +08:00
Code Issues Releases Wiki Activity

Don't dereference begin() when range is empty

Browse Source
This commit is contained in:
olafvdspek@gmail.com 2012-03-20 17:30:24 +00:00
parent bec0d85fe8
commit f1944c73da
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trunk/src/ctemplate/str_ref.h.in
View File

@ -51,7 +51,10 @@ public:
template <class U> template <class U>
str_ref_basic(const U& c) str_ref_basic(const U& c)
{ {
assign(&*c.begin(), c.end() - c.begin() + &*c.begin()); if (c.end() != c.begin())
assign(&*c.begin(), c.end() - c.begin() + &*c.begin());
else
clear();
} }
str_ref_basic(const void* b, const void* e) str_ref_basic(const void* b, const void* e)
@ -66,7 +69,10 @@ public:
str_ref_basic(const char* b) str_ref_basic(const char* b)
{ {
assign(b, strlen(b)); if (b)
assign(b, strlen(b));
else
clear();
} }
void clear() void clear()

10
trunk/src/windows/ctemplate/str_ref.h
View File

@ -56,7 +56,10 @@ public:
template <class U> template <class U>
str_ref_basic(const U& c) str_ref_basic(const U& c)
{ {
assign(&*c.begin(), c.end() - c.begin() + &*c.begin()); if (c.end() != c.begin())
assign(&*c.begin(), c.end() - c.begin() + &*c.begin());
else
clear();
} }
str_ref_basic(const void* b, const void* e) str_ref_basic(const void* b, const void* e)
@ -71,7 +74,10 @@ public:
str_ref_basic(const char* b) str_ref_basic(const char* b)
{ {
assign(b, strlen(b)); if (b)
assign(b, strlen(b));
else
clear();
} }
void clear() void clear()