From fcb451edf5072a325fcd91e005f4348bdeec5cb4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 8 Oct 2021 12:39:42 +0300
Subject: Twitter: fix for rare crash in avatar reader

---
 protocols/Twitter/src/connection.cpp | 3 +--
 protocols/Twitter/src/utility.cpp    | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'protocols/Twitter/src')

diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp
index f7ce4421a2..6a35d2002b 100644
--- a/protocols/Twitter/src/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
@@ -299,8 +299,7 @@ void CTwitterProto::UpdateAvatarWorker(void *p)
 	debugLogA("***** Updating avatar: %s", data->url.c_str());
 	mir_cslock lck(avatar_lock_);
 
-	if (Miranda_IsTerminated()) // if miranda is shutting down...
-	{
+	if (Miranda_IsTerminated()) { // if miranda is shutting down...
 		debugLogA("***** Terminating avatar update early: %s", data->url.c_str());
 		return;
 	}
diff --git a/protocols/Twitter/src/utility.cpp b/protocols/Twitter/src/utility.cpp
index 7e4c269a79..b7198723e2 100644
--- a/protocols/Twitter/src/utility.cpp
+++ b/protocols/Twitter/src/utility.cpp
@@ -92,7 +92,8 @@ bool save_url(HNETLIBUSER hNetlib, const CMStringA &url, const CMStringW &filena
 
 	// Write to file
 	FILE *f = _wfopen(filename, L"wb");
-	fwrite(resp->pData, 1, resp->dataLength, f);
+	if (resp->pData && !IsBadReadPtr(resp->pData, resp->dataLength))
+		fwrite(resp->pData, 1, resp->dataLength, f);
 	fclose(f);
 	
 	return true;
-- 
cgit v1.2.3