Skip to content

Commit 5a8ad99

Browse files
committed
Backport from v5 : avoid crash in StringBase<>(NULL)
It also fixed crash in POSIX build after my last commit.
1 parent 2d4883b commit 5a8ad99

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/common/classes/fb_string.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,8 @@ namespace Firebird
662662
StringBase() : AbstractString(Comparator::getMaxLength()) {}
663663
StringBase(const StringType& v) : AbstractString(Comparator::getMaxLength(), v) {}
664664
StringBase(const void* s, size_type n) : AbstractString(Comparator::getMaxLength(), n, s) {}
665-
StringBase(const_pointer s) : AbstractString(Comparator::getMaxLength(), static_cast<size_type>(strlen(s)), s) {}
665+
StringBase(const_pointer s) :
666+
AbstractString(Comparator::getMaxLength(), static_cast<size_type>(s ? strlen(s) : 0), s) {}
666667
explicit StringBase(const unsigned char* s) :
667668
AbstractString(Comparator::getMaxLength(), static_cast<size_type>(strlen((char*)s)), (char*)s) {}
668669
StringBase(const MetaString& v) : AbstractString(Comparator::getMaxLength(), v) {}

0 commit comments

Comments
 (0)