pool/ghex
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghex?expand=0&rev=5

Browse Source
This commit is contained in:
OBS User unknown 2007-09-03 16:30:03 +00:00 committed by Git OBS Bridge
parent 2886d9995d
commit e4a3757c44
3 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ghex-empty-search-crash.patch Normal file
View File

@ -0,0 +1,38 @@
http://bugzilla.gnome.org/show_bug.cgi?id=473208
================================================================================
--- src/accessiblegtkhex.c
+++ src/accessiblegtkhex.c
@@ -299,11 +299,13 @@
format_xblock (gtk_hex, str, 0,gtk_hex->document->file_size);
}
- utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
- gail_text_util_text_setup (access_gtk_hex->textutil, utf8);
+ if (str) {
+ utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
+ gail_text_util_text_setup (access_gtk_hex->textutil, utf8);
+ g_free (utf8);
+ }
g_free (str);
- g_free (utf8);
return gail_text_util_get_substring (access_gtk_hex->textutil,
start_pos, end_pos);
@@ -494,11 +496,13 @@
format_xblock (gtkhex, str, 0, gtkhex->document->file_size);
}
- utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
- gail_text_util_text_setup (accessible_gtk_hex->textutil, str);
+ if (str) {
+ utf8 = g_locale_to_utf8 (str, -1, NULL, NULL, NULL);
+ gail_text_util_text_setup (accessible_gtk_hex->textutil, str);
+ g_free (utf8);
+ }
g_free (str);
- g_free (utf8);
}

5
ghex.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 3 16:46:11 CEST 2007 - sbrabec@suse.cz
- Fixed crash for empty search string (GNOME#473208).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 9 19:30:43 CEST 2007 - maw@suse.de Thu Aug 9 19:30:43 CEST 2007 - maw@suse.de

6
ghex.spec
View File

@ -17,7 +17,7 @@ BuildRequires: scrollkeeper
License: GPL v2 or later License: GPL v2 or later
Group: Development/Tools/Other Group: Development/Tools/Other
Version: 2.8.2 Version: 2.8.2
Release: 92 Release: 104
Summary: GNOME Binary Editor Summary: GNOME Binary Editor
URL: http://www.gnome.org/ URL: http://www.gnome.org/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/ghex/2.8/%{name}-%{version}.tar.bz2
@ -26,6 +26,7 @@ Patch: ghex_59873.diff
Patch4: ghex_60921.diff Patch4: ghex_60921.diff
Patch5: ghex_60922.diff Patch5: ghex_60922.diff
Patch6: ghex-search-crash.patch Patch6: ghex-search-crash.patch
Patch7: ghex-empty-search-crash.patch
%if %suse_version > 1020 %if %suse_version > 1020
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
%endif %endif
@ -68,6 +69,7 @@ Authors:
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 %patch6
%patch7
# Change po files according to ghex_60921.diff and ghex_60922.diff. # Change po files according to ghex_60921.diff and ghex_60922.diff.
sed -i ' sed -i '
/^msgid "Character _Table\.\.\."/,/^$/s/\.\.\.// /^msgid "Character _Table\.\.\."/,/^$/s/\.\.\.//
@ -140,6 +142,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Mon Sep 03 2007 - sbrabec@suse.cz
- Fixed crash for empty search string (GNOME#473208).
* Thu Aug 09 2007 - maw@suse.de * Thu Aug 09 2007 - maw@suse.de
- Fix up the lang subpackage. - Fix up the lang subpackage.
* Wed Aug 08 2007 - mauro@suse.de * Wed Aug 08 2007 - mauro@suse.de