From ea22bf815ff359791dc23ea48749d22371c09bce Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 17 Nov 2008 11:12:34 +0000 Subject: [PATCH] fix assert failure if NULL size pointer was passed to Request() (as happened in the sample...) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/sckipc.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp index b1223d249b..587268bda6 100644 --- a/src/common/sckipc.cpp +++ b/src/common/sckipc.cpp @@ -582,7 +582,11 @@ const void *wxTCPConnection::Request(const wxString& item, if ( ret != IPC_REQUEST_REPLY ) return NULL; - return m_streams->ReadData(this, size); + // ReadData() needs a non-NULL size pointer but the client code can call us + // with NULL pointer (this makes sense if it knows that it always works + // with NUL-terminated strings) + size_t sizeFallback; + return m_streams->ReadData(this, size ? size : &sizeFallback); } bool wxTCPConnection::DoPoke(const wxString& item, -- 2.45.2