From 9bce8e570a39d0ea688b918383e45310d329c0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 15 Feb 2006 17:15:49 +0000 Subject: [PATCH] BMessage::AddString() no longer crashes when the string to add is NULL. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16410 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Message.cpp | 2 +- src/kits/app/Message4.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp index 435f9f1e28..ee38159012 100644 --- a/src/kits/app/Message.cpp +++ b/src/kits/app/Message.cpp @@ -1287,7 +1287,7 @@ DEFINE_LAZY_FIND_FUNCTION(const char* , String) status_t BMessage::AddString(const char* name, const char* string) { - return AddData(name, B_STRING_TYPE, string, strlen(string) + 1); + return AddData(name, B_STRING_TYPE, string, string ? strlen(string) + 1 : 0); } diff --git a/src/kits/app/Message4.cpp b/src/kits/app/Message4.cpp index 1fbe3ea72b..24b2fac1e3 100644 --- a/src/kits/app/Message4.cpp +++ b/src/kits/app/Message4.cpp @@ -2036,7 +2036,7 @@ DEFINE_LAZY_FIND_FUNCTION(double, Double, 0); status_t BMessage::AddString(const char *name, const char *string) { - return AddData(name, B_STRING_TYPE, string, strlen(string) + 1, false); + return AddData(name, B_STRING_TYPE, string, string ? strlen(string) + 1 : 0, false); }