Commit 869ff348 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Added clearer range checks for string class to help compiler

parent 963d7c52
...@@ -431,7 +431,7 @@ public: ...@@ -431,7 +431,7 @@ public:
StringRep(int size) StringRep(int size)
{ {
u.s.isShort = size<=SHORT_STR_CAPACITY; u.s.isShort = size<=SHORT_STR_CAPACITY;
if (u.s.isShort) // init short string if (size<=SHORT_STR_CAPACITY) // init short string
{ {
if (size>0) if (size>0)
{ {
...@@ -453,8 +453,8 @@ public: ...@@ -453,8 +453,8 @@ public:
if (str) if (str)
{ {
int len = strlen(str); int len = strlen(str);
u.s.isShort = len<=SHORT_STR_MAX_LEN; u.s.isShort = len<SHORT_STR_CAPACITY;
if (u.s.isShort) if (len<SHORT_STR_CAPACITY)
{ {
u.s.len = len; u.s.len = len;
memcpy(u.s.str,str,len+1); memcpy(u.s.str,str,len+1);
...@@ -527,7 +527,7 @@ public: ...@@ -527,7 +527,7 @@ public:
{ {
int len = strlen(str); int len = strlen(str);
u.s.isShort = len<=SHORT_STR_MAX_LEN; u.s.isShort = len<=SHORT_STR_MAX_LEN;
if (u.s.isShort) if (len<SHORT_STR_CAPACITY)
{ {
u.s.len = len; u.s.len = len;
memcpy(u.s.str,str,len+1); memcpy(u.s.str,str,len+1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment