From 1cfc49614fe5e1475fa8990029bd81345c9b6d19 Mon Sep 17 00:00:00 2001
From: shatty <shatty@nowhere.fake>
Date: Tue, 16 Sep 2003 03:45:51 +0000
Subject: [PATCH] fixed BMessage::Flatten(x) so that it does not crash

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4710 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/app/Message.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index 0c32595622..0bed0ca2bc 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -576,7 +576,10 @@ status_t BMessage::Flatten(BDataIO* stream, ssize_t* size) const
 		err = Flatten(buffer, len);
 		if (!err)
 		{
-			*size = len;
+			// size is an optional parameter, don't crash on NULL
+			if (size != NULL) {
+				*size = len;
+			}
 			err = stream->Write(buffer, len);
 			if (err > B_OK)
 				err = B_OK;