From d4ee92478e937b4951a4372b2ac886605535610a Mon Sep 17 00:00:00 2001 From: dmiller Date: Mon, 29 Jan 2024 18:31:37 +0000 Subject: [PATCH] Update calls to gtk.TextBuffer.get_text to include all args. Fixes #2739. Closes #2740. --- CHANGELOG | 2 ++ zenmap/radialnet/bestwidgets/textview.py | 6 ++++-- zenmap/zenmapGUI/CrashReport.py | 3 ++- zenmap/zenmapGUI/ProfileEditor.py | 3 ++- zenmap/zenmapGUI/ScanHostDetailsPage.py | 3 ++- zenmap/zenmapGUI/ScanInterface.py | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cab30166b..545c7ceff 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ #Nmap Changelog ($Id$); -*-text-*- +o [Zenmap][GH#2739] Fix a crash in Zenmap when changing a host comment. + o [NSE][GH#2766] Fix TLS 1.2 signature algorithms for EdDSA. [Daniel Roethlisberger] o [GH#2672] Fixed an issue where TCP Connect scan (-sT) on Windows would fail to open any diff --git a/zenmap/radialnet/bestwidgets/textview.py b/zenmap/radialnet/bestwidgets/textview.py index 9deda9396..70624a0b3 100644 --- a/zenmap/radialnet/bestwidgets/textview.py +++ b/zenmap/radialnet/bestwidgets/textview.py @@ -109,7 +109,8 @@ class BWTextView(BWScrolledWindow): """ """ return self.__textbuffer.get_text(self.__textbuffer.get_start_iter(), - self.__textbuffer.get_end_iter()) + self.__textbuffer.get_end_iter(), + include_hidden_chars=True) def bw_set_scroll_down(self): """ @@ -201,7 +202,8 @@ class BWTextEditor(BWScrolledWindow): """ """ return self.__textbuffer.get_text(self.__textbuffer.get_start_iter(), - self.__textbuffer.get_end_iter()) + self.__textbuffer.get_end_iter(), + include_hidden_chars=True) def bw_set_scroll_down(self): """ diff --git a/zenmap/zenmapGUI/CrashReport.py b/zenmap/zenmapGUI/CrashReport.py index 337eab27e..bb5cc8b1c 100644 --- a/zenmap/zenmapGUI/CrashReport.py +++ b/zenmap/zenmapGUI/CrashReport.py @@ -156,7 +156,8 @@ class CrashReport(HIGDialog): def get_description(self): buff = self.description_text.get_buffer() - return buff.get_text(buff.get_start_iter(), buff.get_end_iter(), include_hidden_chars=True) + return buff.get_text(buff.get_start_iter(), buff.get_end_iter(), + include_hidden_chars=True) def copy(self, widget=None, event=None): clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) diff --git a/zenmap/zenmapGUI/ProfileEditor.py b/zenmap/zenmapGUI/ProfileEditor.py index 5c374d9a0..cab66fb7c 100644 --- a/zenmap/zenmapGUI/ProfileEditor.py +++ b/zenmap/zenmapGUI/ProfileEditor.py @@ -315,7 +315,8 @@ class ProfileEditor(HIGWindow): buf = self.profile_description_text.get_buffer() description = buf.get_text( - buf.get_start_iter(), buf.get_end_iter(), include_hidden_chars=True) + buf.get_start_iter(), buf.get_end_iter(), + include_hidden_chars=True) try: self.profile.add_profile( diff --git a/zenmap/zenmapGUI/ScanHostDetailsPage.py b/zenmap/zenmapGUI/ScanHostDetailsPage.py index f275c2645..068793bd9 100644 --- a/zenmap/zenmapGUI/ScanHostDetailsPage.py +++ b/zenmap/zenmapGUI/ScanHostDetailsPage.py @@ -467,4 +467,5 @@ class HostDetails(HIGVBox): def get_comment(self): buffer = self.comment_txt_vw.get_buffer() - return buffer.get_text(buffer.get_start_iter(), buffer.get_end_iter()) + return buffer.get_text(buffer.get_start_iter(), buffer.get_end_iter(), + include_hidden_chars=True) diff --git a/zenmap/zenmapGUI/ScanInterface.py b/zenmap/zenmapGUI/ScanInterface.py index 40f59b9be..045dd7aa1 100644 --- a/zenmap/zenmapGUI/ScanInterface.py +++ b/zenmap/zenmapGUI/ScanInterface.py @@ -780,7 +780,8 @@ class ScanInterface(HIGVBox): entry.""" buff = widget.get_buffer() comment = buff.get_text( - buff.get_start_iter(), buff.get_end_iter()) + buff.get_start_iter(), buff.get_end_iter(), + include_hidden_chars=True) if host.comment == comment: # no change, ignore return