Fix CallbackQueryHandler Not Handling Non-String Data Correctly With Regex Patterns (python-telegram-bot#3252)

Bibo-Joshi · web-flow · commit c6721a799da8 · 2022-09-22T20:30:30.000+02:00
diff --git a/telegram/ext/_callbackqueryhandler.py b/telegram/ext/_callbackqueryhandler.py
@@ -130,6 +130,7 @@ def check_update(self, update: object) -> Optional[Union[bool, object]]:
             :obj:`bool`
 
         """
+        # pylint: disable=too-many-return-statements
         if isinstance(update, Update) and update.callback_query:
             callback_data = update.callback_query.data
             if self.pattern:
@@ -139,6 +140,8 @@ def check_update(self, update: object) -> Optional[Union[bool, object]]:
                     return isinstance(callback_data, self.pattern)
                 if callable(self.pattern):
                     return self.pattern(callback_data)
+                if not isinstance(callback_data, str):
+                    return False
                 match = re.match(self.pattern, callback_data)
                 if match:
                     return match
diff --git a/tests/test_callbackqueryhandler.py b/tests/test_callbackqueryhandler.py
@@ -32,7 +32,7 @@
     Update,
     User,
 )
-from telegram.ext import CallbackContext, CallbackQueryHandler, JobQueue
+from telegram.ext import CallbackContext, CallbackQueryHandler, InvalidCallbackData, JobQueue
 
 message = Message(1, None, Chat(1, ""), from_user=User(1, "", False), text="Text")
 
@@ -136,6 +136,11 @@ def test_with_pattern(self, callback_query):
         callback_query.callback_query.game_short_name = "this is a short game name"
         assert not handler.check_update(callback_query)
 
+        callback_query.callback_query.data = object()
+        assert not handler.check_update(callback_query)
+        callback_query.callback_query.data = InvalidCallbackData()
+        assert not handler.check_update(callback_query)
+
     def test_with_callable_pattern(self, callback_query):
         class CallbackData:
             pass
