fixes #177 - add null pointer checks

d99kris · Dec 29, 2023 · fad3050 · fad3050
1 parent 9df4833
commit fad3050
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/common/src/version.h b/lib/common/src/version.h
@@ -7,4 +7,4 @@
 
 #pragma once
 
-#define NCHAT_VERSION "4.21"
+#define NCHAT_VERSION "4.22"
diff --git a/lib/tgchat/src/tgchat.cpp b/lib/tgchat/src/tgchat.cpp
@@ -1958,6 +1958,8 @@ std::int64_t TgChat::Impl::GetSenderId(const td::td_api::message& p_TdMessage)
 
 std::string TgChat::Impl::GetText(td::td_api::object_ptr<td::td_api::formattedText>&& p_FormattedText)
 {
+  if (!p_FormattedText) return "";
+
   std::string text = p_FormattedText->text_;
   static const bool markdownEnabled = (m_Config.Get("markdown_enabled") == "1");
   static const int32_t markdownVersion = (m_Config.Get("markdown_version") == "1") ? 1 : 2;
@@ -2275,6 +2277,8 @@ void TgChat::Impl::TdMessageContentConvert(td::td_api::MessageContent& p_TdMessa
 
 void TgChat::Impl::TdMessageConvert(td::td_api::message& p_TdMessage, ChatMessage& p_ChatMessage)
 {
+  if (!p_TdMessage.content_) return;
+
   const int64_t senderId = GetSenderId(p_TdMessage);
   TdMessageContentConvert(*p_TdMessage.content_, senderId, p_ChatMessage.text, p_ChatMessage.fileInfo);
 

diff --git a/src/nchat.1 b/src/nchat.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NCHAT "1" "December 2023" "nchat v4.21" "User Commands"
+.TH NCHAT "1" "December 2023" "nchat v4.22" "User Commands"
 .SH NAME
 nchat \- ncurses chat
 .SH SYNOPSIS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@

		#pragma once

		#define NCHAT_VERSION "4.21"
		#define NCHAT_VERSION "4.22"