Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Wed Nov 29 17:34:25 CET 2006. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-11-27 16:59:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-11-29 16:54:05.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 29 16:53:31 CET 2006 - wstephenson@suse.de + +- Fix mozilla crash when loading user defined Chrome on x86_64. + +------------------------------------------------------------------- New: ---- safe-userchrome.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.PRIBtk/_old 2006-11-29 17:33:34.000000000 +0100 +++ /var/tmp/diff_new_pack.PRIBtk/_new 2006-11-29 17:33:34.000000000 +0100 @@ -17,7 +17,7 @@ Group: System/GUI/KDE Summary: QtCurve style for KDE Version: 0.45.3 -Release: 14 +Release: 16 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz Patch: fix-return-value.diff @@ -25,6 +25,7 @@ Patch2: fixme.diff Patch3: fix_braces_and_switch_compiler_warnings.diff Patch4: x86_64_shaped_cluebat.diff +Patch5: safe-userchrome.diff %if %suse_version > 1010 Recommends: qtcurve-kde %endif @@ -45,10 +46,11 @@ %patch2 %patch3 %patch4 +%patch5 %build -export CFLAGS="$RPM_OPT_FLAGS -O0" -export CXXFLAGS="$RPM_OPT_FLAGS -O0" +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS" ./configure %__make %{?jobs:-j %jobs} @@ -76,6 +78,8 @@ /opt/gnome/share/themes/QtCurve %changelog -n qtcurve-gtk2 +* Wed Nov 29 2006 - wstephenson@suse.de +- Fix mozilla crash when loading user defined Chrome on x86_64. * Mon Nov 27 2006 - wstephenson@suse.de - Fix crashes when leaving menubar on x86_64 machines (#223674) * Fri Nov 24 2006 - stbinner@suse.de ++++++ safe-userchrome.diff ++++++ --- gtk2/qt_settings.c +++ gtk2/qt_settings.c @@ -19,6 +19,9 @@ #endif #include <gdk/gdkcolor.h> #include <gtk/gtkenums.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/unistd.h> /* #define QTC_DEBUG @@ -755,16 +758,18 @@ char *contents=NULL; gboolean add_css=TRUE, remove_menu_colors=FALSE; - int size=0; - + struct stat st; + size_t file_size=0; + size_t new_size=0; if(f) { - if(0==fseek(f, 0, SEEK_END) && 0==fgetpos(f, (fpos_t*)&size) && size>0 && 0==fseek(f, 0, SEEK_SET)) + if(0==fstat(f, &st ) ) { - size+=strlen(MENU_TEXT_STR)+strlen(CSS_FILE_STR)+3; + file_size = st.st_size; + new_size=file_size+strlen(MENU_TEXT_STR)+strlen(CSS_FILE_STR)+3; - contents=(char *)malloc(size); + contents=(char *)malloc(new_size); if(contents) { @@ -806,9 +811,9 @@ { if(!contents) { - size=strlen(MENU_TEXT_STR)+strlen(CSS_FILE_STR)+3; + new_size=strlen(MENU_TEXT_STR)+strlen(CSS_FILE_STR)+3; - contents=(char *)malloc(size); + contents=(char *)malloc(new_size); if(contents) contents[0]='\0'; } @@ -817,7 +822,7 @@ { if(add_css) /* CSS needs to be on 1st line */ { - char *css_contents=(char *)malloc(size); + char *css_contents=(char *)malloc(new_size); if(css_contents) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org