- Fix NULL pointer dereference in gtkDrawFlatBox() in x11-themes/qtcurve-gtk2 [1]

- Set LICENSE
- Take maintainership of the qtcurve ports

PR:		211391 [1]
Submitted by:	<f.degner@gmx.de> [1]
This commit is contained in:
Jason E. Hale 2016-10-22 23:20:21 +00:00
parent 7e8c48b45d
commit 1580accc33
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=424491
3 changed files with 16 additions and 2 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= qtcurve
PORTREVISION= 0
PORTREVISION= 1
COMMENT= QtCurve GTK+ 2.x engine and theme

View File

@ -4,7 +4,7 @@ PORTNAME= qtcurve
PORTVERSION= 1.8.18
CATEGORIES= x11-themes
MAINTAINER= ports@FreeBSD.org
MAINTAINER= jhale@FreeBSD.org
COMMENT?= Widget styles for Qt and GTK+ toolkits
.if !defined(QTCURVE_SLAVE)
@ -21,6 +21,9 @@ QT4_RUN_DEPENDS= qt4-style-qtcurve>=1.8.18:x11-themes/qtcurve-qt4
QT5_RUN_DEPENDS= qt5-style-qtcurve>=1.8.18:x11-themes/qtcurve-qt5
.else # !defined(QTCURVE_SLAVE)
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_ACCOUNT= QtCurve

View File

@ -0,0 +1,11 @@
--- gtk2/style/qtcurve.c.orig 2014-01-25 20:13:54 UTC
+++ gtk2/style/qtcurve.c
@@ -372,7 +372,7 @@ gtkDrawFlatBox(GtkStyle *style, GdkWindo
} else if (!(qtSettings.app == GTK_APP_JAVA && widget &&
GTK_IS_LABEL(widget))) {
if (state != GTK_STATE_PRELIGHT || opts.crHighlight ||
- strcmp(detail, "checkbutton") != 0) {
+ ( detail != NULL && strcmp(detail, "checkbutton") != 0 )) {
parent_class->draw_flat_box(style, window, state, shadow, area,
widget, detail, x, y, width, height);
}