From d761df9f70fd928c5423e35330e327a63e0e24f5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 14 Sep 2019 21:25:49 +0200 Subject: [PATCH] BMessage: fix NULL pointer dereference in out of memory condition. Change-Id: I75ba6e5069cda8a92fd88bf7d1e999232359e73c Reviewed-on: https://review.haiku-os.org/c/haiku/+/1864 Reviewed-by: waddlesplash --- src/kits/app/Message.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp index a111a294bf..b4a411f34b 100644 --- a/src/kits/app/Message.cpp +++ b/src/kits/app/Message.cpp @@ -165,8 +165,9 @@ BMessage::BMessage(BMessage* other) BMessage::BMessage(uint32 _what) { DEBUG_FUNCTION_ENTER; - _InitCommon(true); - fHeader->what = what = _what; + if (_InitCommon(true)) + fHeader->what = _what; + what = _what; }