Attachment #112615 for bug #154044

View | Details | Raw Unified | Return to bug 154044
Collapse All | Expand All




#

PORTNAME=	open-motif
PORTVERSION=	2.3.3
PORTREVISION=	6
CATEGORIES=	x11-toolkits
MASTER_SITES=	ftp://ftp.ics.com/openmotif/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/
DISTNAME=	openmotif-${PORTVERSION}
EXTRACT_SUFX=	.tar.gz
DIST_SUBDIR=	openmotif

MAINTAINER=	michael@fun-box.ru
COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))

MAKE_JOBS_UNSAFE=	yes

USE_AUTOTOOLS=	libtool
CONFLICTS=	lesstif-[0-9]*
USE_GMAKE=	yes
USE_XORG=	xaw xbitmaps
GNU_CONFIGURE=	yes




	XmCreateMenuShell.3 \
	XmCreateMessageBox.3 \
	XmCreateMessageDialog.3 \
	XmCreateMultiList.3 \
	XmCreateNotebook.3 \
	XmCreateOptionMenu.3 \
	XmCreatePanedWindow.3 \

	XmDrawingArea.3 \
	XmDrawnButton.3 \
	XmDropDown.3 \
	XmDropDownGetArrow.3 \
	XmDropDownGetLabel.3 \
	XmDropDownGetList.3 \
	XmDropDownGetText.3 \
	XmDropDownGetValue.3 \
	XmDropSite.3 \
	XmDropSiteConfigureStackingOrder.3 \
	XmDropSiteEndUpdate.3 \

	XmMessageBox.3 \
	XmMessageBoxGetChild.3 \
	XmMultiList.3 \
	XmMultiListDeselectAllItems.3 \
	XmMultiListDeselectItem.3 \
	XmMultiListDeselectItems.3 \
	XmMultiListDeselectRow.3 \
	XmMultiListGetSelectedRowArray.3 \
	XmMultiListGetSelectedRows.3 \

	XmVaCreateSimplePulldownMenu.3 \
	XmVaCreateSimpleRadioBox.3 \
	XmWidgetGetBaselines.3 \
	XmCreateButtonBox.3 \
	XmCreateCombinationBox2.3 \
	XmCreateHierarchy.3 \
	XmCreateOutline.3 \
	XmDataFieldCopy.3 \
	XmDataFieldCut.3 \
	XmDataFieldGetSelection.3 \
	XmDataFieldGetSelectionPosition.3 \
	XmDataFieldGetString.3 \
	XmDataFieldGetStringWcs.3 \
	XmDataFieldPaste.3 \
	XmDataFieldSetAddMode.3 \
	XmDataFieldSetEditable.3 \
	XmDataFieldSetHighlight.3 \
	XmDataFieldSetInsertionPosition.3 \
	XmDataFieldSetSelection.3 \
	XmDataFieldSetString.3 \
	XmDataFieldXYToPos.3 \
	XmDropDownGetChild.3 \
	XmExt18List.3 \
	XmHierarchy.3 \
	XmHierarchyGetChildNodes.3 \
	XmHierarchyOpenAllAncestors.3 \
	XmIconBoxIsCellEmpty.3 \
	XmMultiListDeselectItems.3 \
	XmMultiListUnselectAllItems.3 \
	XmMultiListUnselectItem.3 \
	XmOutline.3 \
	XmPaned.3 \
	XmPanedGetPanes.3 \
	XmTabStackGetSelectedTab.3 \
	XmTabStackSelectTab.3 \
	XmTabStackXYToWidget.3 \
	XmVaCreateArrowButton.3 \
	XmVaCreateArrowButtonGadget.3 \
	XmVaCreateBulletinBoard.3 \
	XmVaCreateButtonBox.3 \
	XmVaCreateCascadeButton.3 \
	XmVaCreateCascadeButtonGadget.3 \
	XmVaCreateColorSelector.3 \
	XmVaCreateColumn.3 \
	XmVaCreateCombinationBox2.3 \
	XmVaCreateComboBox.3 \
	XmVaCreateCommand.3 \
	XmVaCreateContainer.3 \
	XmVaCreateDataField.3 \
	XmVaCreateDrawingArea.3 \
	XmVaCreateDrawnButton.3 \
	XmVaCreateDropDown.3 \
	XmVaCreateExt18List.3 \
	XmVaCreateFileSelectionBox.3 \
	XmVaCreateForm.3 \
	XmVaCreateFrame.3 \
	XmVaCreateHierarchy.3 \
	XmVaCreateIconGadget.3 \
	XmVaCreateLabel.3 \
	XmVaCreateLabelGadget.3 \
	XmVaCreateList.3 \
	XmVaCreateMainWindow.3 \
	XmVaCreateManagedArrowButton.3 \
	XmVaCreateManagedArrowButtonGadget.3 \
	XmVaCreateManagedBulletinBoard.3 \
	XmVaCreateManagedButtonBox.3 \
	XmVaCreateManagedCascadeButton.3 \
	XmVaCreateManagedCascadeButtonGadget.3 \
	XmVaCreateManagedColorSelector.3 \
	XmVaCreateManagedColumn.3 \
	XmVaCreateManagedCombinationBox2.3 \
	XmVaCreateManagedComboBox.3 \
	XmVaCreateManagedCommand.3 \
	XmVaCreateManagedContainer.3 \
	XmVaCreateManagedDataField.3 \
	XmVaCreateManagedDrawingArea.3 \
	XmVaCreateManagedDrawnButton.3 \
	XmVaCreateManagedDropDown.3 \
	XmVaCreateManagedExt18List.3 \
	XmVaCreateManagedFileSelectionBox.3 \
	XmVaCreateManagedForm.3 \
	XmVaCreateManagedFrame.3 \
	XmVaCreateManagedHierarchy.3 \
	XmVaCreateManagedIconGadget.3 \
	XmVaCreateManagedLabel.3 \
	XmVaCreateManagedLabelGadget.3 \
	XmVaCreateManagedList.3 \
	XmVaCreateManagedMainWindow.3 \
	XmVaCreateManagedMessageBox.3 \
	XmVaCreateManagedMultiList.3 \
	XmVaCreateManagedNotebook.3 \
	XmVaCreateManagedOutline.3 \
	XmVaCreateManagedPanedWindow.3 \
	XmVaCreateManagedPushButton.3 \
	XmVaCreateManagedPushButtonGadget.3 \
	XmVaCreateManagedRowColumn.3 \
	XmVaCreateManagedScale.3 \
	XmVaCreateManagedScrollBar.3 \
	XmVaCreateManagedScrolledWindow.3 \
	XmVaCreateManagedSelectionBox.3 \
	XmVaCreateManagedSeparatorGadget.3 \
	XmVaCreateManagedSimpleSpinBox.3 \
	XmVaCreateManagedSpinBox.3 \
	XmVaCreateManagedTabStack.3 \
	XmVaCreateManagedText.3 \
	XmVaCreateManagedTextField.3 \
	XmVaCreateManagedToggleButton.3 \
	XmVaCreateManagedToggleButtonGadget.3 \
	XmVaCreateMessageBox.3 \
	XmVaCreateMultiList.3 \
	XmVaCreateNotebook.3 \
	XmVaCreateOutline.3 \
	XmVaCreatePanedWindow.3 \
	XmVaCreatePushButton.3 \
	XmVaCreatePushButtonGadget.3 \
	XmVaCreateRowColumn.3 \
	XmVaCreateScale.3 \
	XmVaCreateScrollBar.3 \
	XmVaCreateScrolledWindow.3 \
	XmVaCreateSelectionBox.3 \
	XmVaCreateSeparatorGadget.3 \
	XmVaCreateSimpleSpinBox.3 \
	XmVaCreateSpinBox.3 \
	XmVaCreateTabStack.3 \
	XmVaCreateText.3 \
	XmVaCreateTextField.3 \
	XmVaCreateToggleButton.3 \
	XmVaCreateToggleButtonGadget.3 \
	XmWidgetGetDisplayRect.3
MAN5= \
	Traits.5 \

Lines 1-3 Link Here

(-)open-motif/distinfo (-3 / +2 lines)
1	MD5 (openmotif/openMotif-2.2.3.tar.gz) = 94c96a0f94ee0d5e41d3dba2188b263d	1	SHA256 (openmotif/openmotif-2.3.3.tar.gz) = c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
2	SHA256 (openmotif/openMotif-2.2.3.tar.gz) = 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9	2	SIZE (openmotif/openmotif-2.3.3.tar.gz) = 6051202
3	SIZE (openmotif/openMotif-2.2.3.tar.gz) = 5149785

Lines 1-11 Link Here

(-)open-motif/files/patch-Makefile.in (-9 / +9 lines)
1	--- Makefile.in.orig Tue Apr 6 13:50:25 2004	1	--- Makefile.in.orig 2010-03-12 17:45:02.000000000 +0300
2	+++ Makefile.in Thu Jul 29 21:14:05 2004	2	+++ Makefile.in 2011-01-16 00:21:21.000000000 +0300
3	@@ -101,7 +101,7 @@	3	@@ -289,7 +289,7 @@
4	MAINTAINERCLEANFILES = Makefile.in configure libtool config.guess config.sub config.log ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs	4	tools \
5		5	clients \
6		6	doc \
7	-SUBDIRS = bindings bitmaps config localized lib include tools clients doc demos	7	- demos
8	+SUBDIRS = bindings bitmaps config localized lib include tools clients doc $(DEMOS)	8	+ ${DEMOS}
9		9
10	AUTOMAKE_OPTIONS = 1.4	10	AUTOMAKE_OPTIONS = 1.4
11	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4	11	ACLOCAL_AMFLAGS = -I .

Lines 1-11 Link Here

(-)open-motif/files/patch-clients::mwm::Makefile.in (-10 / +9 lines)
1	--- clients/mwm/Makefile.in.orig Tue Apr 6 13:50:25 2004	1	--- clients/mwm/Makefile.in.orig 2010-03-12 17:44:20.000000000 +0300
2	+++ clients/mwm/Makefile.in Thu Jul 29 21:16:47 2004	2	+++ clients/mwm/Makefile.in 2011-01-16 00:23:47.000000000 +0300
3	@@ -104,7 +104,7 @@	3	@@ -314,6 +314,7 @@
4	bin_PROGRAMS = mwm	4	-DBITMAPDIR=\"@INCDIR@/bitmaps\" \
5	mwm_LDADD = ./WmWsmLib/libWsm.a ../../lib/Xm/libXm.la	5	-DMWMRCDIR=\"$(MWMRCDIR)\" \
		6	-I$(top_builddir)/lib \
		7	+ -DLIBDIR=\"@LIBDIR@\" \
		8	-I$(srcdir)/../../lib ${X_CFLAGS}
6		9
7	-INCLUDES = -DLARGECURSORS -DR2_COMPAT -DUNMAP_ON_RESTART -DCDE_INSTALLATION_TOP=\"@CDE_INSTALLATION_TOP@\" -DCDE_CONFIGURATION_TOP=\"@CDE_CONFIGURATION_TOP@\" -DBITMAPDIR=\"@INCDIR@/bitmaps\" -I$(srcdir)/../../lib ${X_CFLAGS}	10	SRCS1 = WmCDInfo.c WmCDecor.c WmCEvent.c\
8	+INCLUDES = -DLARGECURSORS -DR2_COMPAT -DUNMAP_ON_RESTART -DCDE_INSTALLATION_TOP=\"@CDE_INSTALLATION_TOP@\" -DCDE_CONFIGURATION_TOP=\"@CDE_CONFIGURATION_TOP@\" -DBITMAPDIR=\"@INCDIR@/bitmaps\" -DLIBDIR=\"@LIBDIR@\" -I$(srcdir)/../../lib ${X_CFLAGS}
9
10
11	SRCS1 = WmCDInfo.c WmCDecor.c WmCEvent.c WmCPlace.c WmColormap.c WmError.c WmEvent.c WmFeedback.c WmFunction.c WmGraphics.c WmIDecor.c WmIPlace.c WmIconBox.c WmKeyFocus.c WmMain.c WmManage.c WmProperty.c WmResCvt.c WmResParse.c WmResource.c WmSignal.c WmWinConf.c WmWinInfo.c WmWinList.c WmWinState.c WmWsm.c WmXSMP.c version.c WmCmd.c WmImage.c WmInitWs.c WmMenu.c WmProtocol.c

Line 0 Link Here

(-)open-motif/files/patch-clients::uil::UilDefI.h (+11 lines)
	1	--- clients/uil/UilDefI.h.orig 2011-01-16 01:16:45.000000000 +0300
	2	+++ clients/uil/UilDefI.h 2011-01-16 01:17:35.000000000 +0300
	3	@@ -283,7 +283,7 @@
	4	#include "UilIODef.h"
	5	#include "UilDiagDef.h"
	6	#include "UilSarDef.h"
	7	-#if defined(linux)
	8	+#if defined(linux) \|\| defined(__FreeBSD__)
	9	#define YYSTYPE yystype
	10	#endif
	11	#include "UilLexPars.h"

Lines 1-11 Link Here

(-)open-motif/files/patch-demos::programs::Makefile.in (-11 / +10 lines)
1	--- demos/programs/Makefile.in.orig Tue Apr 6 13:50:30 2004	1	--- demos/programs/Makefile.in.orig 2010-03-12 17:44:37.000000000 +0300
2	+++ demos/programs/Makefile.in Thu Jul 29 21:19:05 2004	2	+++ demos/programs/Makefile.in 2011-01-16 00:29:46.000000000 +0300
3	@@ -93,7 +93,7 @@	3	@@ -261,7 +261,6 @@
4		4	popups \
5	MAINTAINERCLEANFILES = Makefile.in	5	sampler2_0 \
6		6	setdate \
7	-SUBDIRS = airport animate drag_and_drop draw earth filemanager fileview getsubres hellomotif i18ninput panner periodic piano popups sampler2_0 setdate Exm todo workspace hellomotifi18n tooltips ButtonBox Column FontSel Outline TabStack Tree ColorSel DropDown MultiList IconB Paned pixmaps	7	- Exm \
8	+SUBDIRS = airport animate drag_and_drop draw earth filemanager fileview getsubres hellomotif i18ninput panner periodic piano popups sampler2_0 setdate todo workspace hellomotifi18n tooltips ButtonBox Column FontSel Outline TabStack Tree ColorSel DropDown MultiList IconB Paned pixmaps	8	todo \
9		9	workspace \
10		10	hellomotifi18n \
11	EXTRA_DIST = Imakefile

Lines 1-11 Link Here

(-)open-motif/files/patch-doc::man::Makefile.in (-9 / +9 lines)
1	--- doc/man/Makefile.in.orig Thu Feb 14 23:15:49 2002	1	--- doc/man/Makefile.in.orig 2010-03-12 17:44:56.000000000 +0300
2	+++ doc/man/Makefile.in Tue Sep 3 23:06:51 2002	2	+++ doc/man/Makefile.in 2011-01-16 00:36:46.000000000 +0300
3	@@ -89,7 +89,7 @@	3	@@ -245,7 +245,7 @@
4	X_XMU = @X_XMU@	4	top_builddir = @top_builddir@
5	YACC = @YACC@	5	top_srcdir = @top_srcdir@
6		6	MAINTAINERCLEANFILES = Makefile.in
7	-SUBDIRS = man1 man3 man4 man5	7	-SUBDIRS = man1 man3 man4 man5
8	+SUBDIRS = man1 man3 man5	8	+SUBDIRS = man1 man3 man5
9	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	9	all: all-recursive
10	CONFIG_HEADER = ../../include/config.h	10
11	CONFIG_CLEAN_FILES =	11	.SUFFIXES:




--- doc/man/man5/Makefile.in.orig	2011-01-16 02:23:56.000000000 +0300
+++ doc/man/man5/Makefile.in	2011-01-16 02:24:21.000000000 +0300
@@ -234,7 +234,8 @@
 man_MANS = \
     Traits.5 \
     UIL.5 \
-    WML.5
+    WML.5 \
+    mwmrc.5
 
 all: all-am
 
-man_MANS =      Traits.5     UIL.5     WML.5
+man_MANS =      Traits.5     UIL.5     WML.5      mwmrc.5
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../include/config.h




--- lib/Mrm/MrmItop.c~	Fri Jan 11 14:56:23 2002
+++ lib/Mrm/MrmItop.c	Sun Nov 23 19:42:03 2003
@@ -642,10 +642,11 @@
    *  Local variables
    */
   Cardinal	result ;		/* function results */
+  IDBResource	resid ;
 
   if ( (result=Idb__FIL_Valid((IDBFile)file_id)) != MrmSUCCESS ) return result ;
-  result = Idb__RID_NextRID ((IDBFile)file_id, 
-			     (IDBResource *)resource_id_return) ;
+  result = Idb__RID_NextRID ((IDBFile)file_id, &resid) ;
+  if ( result == MrmSUCCESS ) *resource_id_return = resid;
   return result ;
 
 }




--- lib/Xm/ColorS.c.orig	2005-12-17 16:54:03.000000000 +0300
+++ lib/Xm/ColorS.c	2011-01-16 00:48:05.000000000 +0300
@@ -41,6 +41,10 @@
 
 #define SUPERCLASS ((WidgetClass) &xmManagerClassRec)
 
 #define	offset(field) XmPartOffset(XmColorSelector, field)
 	
+#ifndef LIBDIR
+#define LIBDIR "/usr/local/lib/X11"
+#endif
+
 /************************************************************
  *       MACROS
  ************************************************************/
@@ -131,7 +135,7 @@
   {
     XmNrgbFile, XmCString, XmRString,
     sizeof(String), XtOffsetOf(XmColorSelectorRec, cs.rgb_file),
-    XmRString, (XtPointer) "/usr/lib/X11/rgb.txt"
+    XmRString, (XtPointer) LIBDIR"/rgb.txt"
   },
 #endif
   {
       offset(margin_width), XmRImmediate, (XtPointer) 2 },




--- ltmain.sh.orig	2009-12-02 18:09:01.000000000 +0300
+++ ltmain.sh	2011-01-16 00:51:04.000000000 +0300
@@ -2077,10 +2077,12 @@
 	fi
 
 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false; then
 	func_basename "$file"
 	name="$func_basename_result"
 	instname="$dir/$name"i
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
 
 	# Maybe install the static library, too.




--- lib/Xm/XpmAttrib.c.orig	Sat Jan  1 17:44:26 2005
+++ lib/Xm/XpmAttrib.c	Sat Jan  1 17:46:04 2005
@@ -58,6 +58,8 @@
     XpmColor **colorTable, **color;
     int a;
 
+    if (ncolors > INT_MAX/sizeof(XpmColor *))
+	return (XpmNoMemory);
     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
     if (!colorTable) {
 	*oldct = NULL;
--- lib/Xm/XpmCrDatFrI.c.orig	Sat Jan  1 17:46:37 2005
+++ lib/Xm/XpmCrDatFrI.c	Sat Jan  1 17:47:18 2005
@@ -134,6 +134,8 @@
      */
     header_nlines = 1 + image->ncolors;
     header_size = sizeof(char *) * header_nlines;
+    if (header_size > INT_MAX/sizeof(char *))
+	return (XpmNoMemory);
     header = (char **) XpmCalloc(header_size, sizeof(char *));
     if (!header)
 	return (XpmNoMemory);
--- lib/Xm/XpmI.h.orig	Sat Jan  1 17:47:36 2005
+++ lib/Xm/XpmI.h	Sat Jan  1 17:47:53 2005
@@ -108,6 +108,7 @@
  * lets try to solve include files
  */
 
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 /* stdio.h doesn't declare popen on a Sequent DYNIX OS */
--- lib/Xm/Xpmcreate.c.orig	Sat Jan  1 17:48:09 2005
+++ lib/Xm/Xpmcreate.c	Sat Jan  1 17:51:23 2005
@@ -805,6 +805,8 @@
     ErrorStatus = XpmSuccess;
 
     /* malloc pixels index tables */
+    if (image->ncolors > INT_MAX/sizeof(Pixel))
+	return (XpmNoMemory);
     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
     if (!image_pixels)
 	return (XpmNoMemory);
@@ -948,6 +950,10 @@
 
 #ifndef FOR_MSW
     /* now that bytes_per_line must have been set properly alloc data */
+    if (height != 0 && (*image_return)->bytes_per_line > INT_MAX/height) {
+       XDestroyImage(*image_return);
+	return (XpmNoMemory);
+    }
     (*image_return)->data =
 	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
 
@@ -1992,6 +1998,8 @@
 	xpmGetCmt(data, &colors_cmt);
 
     /* malloc pixels index tables */
+    if (ncolors > INT_MAX/sizeof(Pixel))
+	RETURN(XpmNoMemory);
     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
     if (!image_pixels)
 	RETURN(XpmNoMemory);
@@ -2247,7 +2255,7 @@
 
 	    /* array of pointers malloced by need */
 	    unsigned short *cidx[256];
-	    int char1;
+	    unsigned int char1;
 
 	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
 	    for (a = 0; a < ncolors; a++) {
--- lib/Xm/Xpmhashtab.c.orig	Sat Jan  1 17:51:59 2005
+++ lib/Xm/Xpmhashtab.c	Sat Jan  1 17:56:35 2005
@@ -150,6 +150,8 @@
     HASH_TABLE_GROWS
 	table->size = size;
     table->limit = size / 3;
+    if (size > INT_MAX/sizeof(*atomTable))
+	return (XpmNoMemory);
     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
     if (!atomTable)
 	return (XpmNoMemory);
@@ -210,6 +212,8 @@
     table->size = INITIAL_HASH_SIZE;
     table->limit = table->size / 3;
     table->used = 0;
+    if (table->size > INT_MAX/sizeof(*atomTable))
+	return (XpmNoMemory);
     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
     if (!atomTable)
 	return (XpmNoMemory);
--- lib/Xm/Xpmparse.c.orig	Sat Jan  1 17:53:31 2005
+++ lib/Xm/Xpmparse.c	Sat Jan  1 17:56:33 2005
@@ -335,6 +335,8 @@
     char **defaults;
     int ErrorStatus;
 
+    if (ncolors > INT_MAX/sizeof(XpmColor))
+	return (XpmNoMemory);
     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
     if (!colorTable)
 	return (XpmNoMemory);
@@ -346,6 +348,8 @@
 	    /*
 	     * read pixel value
 	     */
+	    if (cpp > INT_MAX-1)
+		return (XpmNoMemory);
 	    color->string = (char *) XpmMalloc(cpp + 1);
 	    if (!color->string) {
 		xpmFreeColorTable(colorTable, ncolors);
@@ -428,6 +432,8 @@
 	    /*
 	     * read pixel value
 	     */
+	    if (cpp > INT_MAX-1)
+		return (XpmNoMemory);
 	    color->string = (char *) XpmMalloc(cpp + 1);
 	    if (!color->string) {
 		xpmFreeColorTable(colorTable, ncolors);
@@ -490,6 +496,8 @@
     unsigned int *iptr, *iptr2;
     unsigned int a, x, y;
 
+    if (height != 0 && width > INT_MAX/sizeof(unsigned int))
+	return (XpmNoMemory);
 #ifndef FOR_MSW
     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
 #else
@@ -543,7 +551,7 @@
 
 	    /* array of pointers malloced by need */
 	    unsigned short *cidx[256];
-	    int char1;
+	    unsigned int char1;
 
 	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
 	    for (a = 0; a < ncolors; a++) {
--- lib/Xm/Xpmscan.c.orig	Sat Jan  1 17:56:49 2005
+++ lib/Xm/Xpmscan.c	Sat Jan  1 17:59:28 2005
@@ -225,11 +225,16 @@
     else
 	cpp = 0;
 
+    if ((height != 0 && width > INT_MAX/height) ||
+      (width*height > INT_MAX/sizeof(unsigned int)))
+	RETURN(XpmNoMemory);
     pmap.pixelindex =
 	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
     if (!pmap.pixelindex)
 	RETURN(XpmNoMemory);
 
+    if (pmap.size > INT_MAX/sizeof(Pixel))
+	RETURN(XpmNoMemory);
     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
     if (!pmap.pixels)
 	RETURN(XpmNoMemory);
@@ -284,7 +289,8 @@
      * get rgb values and a string of char, and possibly a name for each
      * color
      */
-
+    if (pmap.ncolors > INT_MAX/sizeof(XpmColor))
+	RETURN(XpmNoMemory);
     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
     if (!colorTable)
 	RETURN(XpmNoMemory);
@@ -332,6 +338,8 @@
 
     /* first get a character string */
     a = 0;
+    if (cpp > INT_MAX-1)
+	return (XpmNoMemory);
     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
 	return (XpmNoMemory);
     *s++ = printable[c = a % MAXPRINTABLE];
@@ -423,6 +431,8 @@
     }
 
     /* first get character strings and rgb values */
+    if (ncolors > INT_MAX/sizeof(XColor) || cpp > INT_MAX-1)
+	return (XpmNoMemory);
     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
     if (!xcolors)
 	return (XpmNoMemory);




include/Xm/ToggleBG.h
include/Xm/ToggleBGP.h
include/Xm/ToggleBP.h
include/Xm/ToolTipCT.h	
include/Xm/ToolTipT.h
include/Xm/XmStrDefs23.h
include/Xm/TraitP.h
include/Xm/Transfer.h
include/Xm/TransferP.h

lib/libMrm.a
lib/libMrm.la
lib/libMrm.so
lib/libMrm.so.4
lib/libUil.a
lib/libUil.la
lib/libUil.so
lib/libUil.so.4
lib/libXm.a
lib/libXm.la
lib/libXm.so
lib/libXm.so.4
%%MANUALS%%%%DOCSDIR%%/BUGREPORT
%%MANUALS%%%%DOCSDIR%%/COPYRIGHT.MOTIF
%%MANUALS%%%%DOCSDIR%%/README

Return to bug 154044

Lines 7-27 Link Here

(-)open-motif/Makefile (-7 / +5 lines)
7	#	7	#
8		8
9	PORTNAME= open-motif	9	PORTNAME= open-motif
10	PORTVERSION= 2.2.3	10	PORTVERSION= 2.3.3
11	PORTREVISION= 6
12	CATEGORIES= x11-toolkits	11	CATEGORIES= x11-toolkits
13	MASTER_SITES= ftp://ftp.ics.com/openmotif/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/src/	12	MASTER_SITES= ftp://ftp.ics.com/openmotif/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/
14	DISTNAME= openMotif-${PORTVERSION}	13	DISTNAME= openmotif-${PORTVERSION}
15	EXTRACT_SUFX= .tar.gz
16	DIST_SUBDIR= openmotif	14	DIST_SUBDIR= openmotif
17		15
18	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= michael@fun-box.ru
19	COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295))	17	COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295))
20		18
21	MAKE_JOBS_UNSAFE= yes	19	MAKE_JOBS_UNSAFE= yes
22		20
23	USE_AUTOTOOLS= libtool	21	USE_AUTOTOOLS= libtool
24	CONFLICTS= lesstif-*	22	CONFLICTS= lesstif-[0-9]*
25	USE_GMAKE= yes	23	USE_GMAKE= yes
26	USE_XORG= xaw xbitmaps	24	USE_XORG= xaw xbitmaps
27	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes

Lines 137-143 Link Here

(-)open-motif/Makefile.man (-9 / +125 lines)
137	XmCreateMenuShell.3 \	137	XmCreateMenuShell.3 \
138	XmCreateMessageBox.3 \	138	XmCreateMessageBox.3 \
139	XmCreateMessageDialog.3 \	139	XmCreateMessageDialog.3 \
140	XmCreateMultiList.3 \
141	XmCreateNotebook.3 \	140	XmCreateNotebook.3 \
142	XmCreateOptionMenu.3 \	141	XmCreateOptionMenu.3 \
143	XmCreatePanedWindow.3 \	142	XmCreatePanedWindow.3 \
Lines 198-208 Link Here
198	XmDrawingArea.3 \	197	XmDrawingArea.3 \
199	XmDrawnButton.3 \	198	XmDrawnButton.3 \
200	XmDropDown.3 \	199	XmDropDown.3 \
201	XmDropDownGetArrow.3 \
202	XmDropDownGetLabel.3 \
203	XmDropDownGetList.3 \
204	XmDropDownGetText.3 \
205	XmDropDownGetValue.3 \
206	XmDropSite.3 \	200	XmDropSite.3 \
207	XmDropSiteConfigureStackingOrder.3 \	201	XmDropSiteConfigureStackingOrder.3 \
208	XmDropSiteEndUpdate.3 \	202	XmDropSiteEndUpdate.3 \
Lines 328-336 Link Here
328	XmMessageBox.3 \	322	XmMessageBox.3 \
329	XmMessageBoxGetChild.3 \	323	XmMessageBoxGetChild.3 \
330	XmMultiList.3 \	324	XmMultiList.3 \
331	XmMultiListDeselectAllItems.3 \
332	XmMultiListDeselectItem.3 \
333	XmMultiListDeselectItems.3 \
334	XmMultiListDeselectRow.3 \	325	XmMultiListDeselectRow.3 \
335	XmMultiListGetSelectedRowArray.3 \	326	XmMultiListGetSelectedRowArray.3 \
336	XmMultiListGetSelectedRows.3 \	327	XmMultiListGetSelectedRows.3 \
Lines 594-599 Link Here
594	XmVaCreateSimplePulldownMenu.3 \	585	XmVaCreateSimplePulldownMenu.3 \
595	XmVaCreateSimpleRadioBox.3 \	586	XmVaCreateSimpleRadioBox.3 \
596	XmWidgetGetBaselines.3 \	587	XmWidgetGetBaselines.3 \
		588	XmCreateButtonBox.3 \
		589	XmCreateCombinationBox2.3 \
		590	XmCreateHierarchy.3 \
		591	XmCreateOutline.3 \
		592	XmDataFieldCopy.3 \
		593	XmDataFieldCut.3 \
		594	XmDataFieldGetSelection.3 \
		595	XmDataFieldGetSelectionPosition.3 \
		596	XmDataFieldGetString.3 \
		597	XmDataFieldGetStringWcs.3 \
		598	XmDataFieldPaste.3 \
		599	XmDataFieldSetAddMode.3 \
		600	XmDataFieldSetEditable.3 \
		601	XmDataFieldSetHighlight.3 \
		602	XmDataFieldSetInsertionPosition.3 \
		603	XmDataFieldSetSelection.3 \
		604	XmDataFieldSetString.3 \
		605	XmDataFieldXYToPos.3 \
		606	XmDropDownGetChild.3 \
		607	XmExt18List.3 \
		608	XmHierarchy.3 \
		609	XmHierarchyGetChildNodes.3 \
		610	XmHierarchyOpenAllAncestors.3 \
		611	XmIconBoxIsCellEmpty.3 \
		612	XmMultiListDeselectItems.3 \
		613	XmMultiListUnselectAllItems.3 \
		614	XmMultiListUnselectItem.3 \
		615	XmOutline.3 \
		616	XmPaned.3 \
		617	XmPanedGetPanes.3 \
		618	XmTabStackGetSelectedTab.3 \
		619	XmTabStackSelectTab.3 \
		620	XmTabStackXYToWidget.3 \
		621	XmVaCreateArrowButton.3 \
		622	XmVaCreateArrowButtonGadget.3 \
		623	XmVaCreateBulletinBoard.3 \
		624	XmVaCreateButtonBox.3 \
		625	XmVaCreateCascadeButton.3 \
		626	XmVaCreateCascadeButtonGadget.3 \
		627	XmVaCreateColorSelector.3 \
		628	XmVaCreateColumn.3 \
		629	XmVaCreateCombinationBox2.3 \
		630	XmVaCreateComboBox.3 \
		631	XmVaCreateCommand.3 \
		632	XmVaCreateContainer.3 \
		633	XmVaCreateDataField.3 \
		634	XmVaCreateDrawingArea.3 \
		635	XmVaCreateDrawnButton.3 \
		636	XmVaCreateDropDown.3 \
		637	XmVaCreateExt18List.3 \
		638	XmVaCreateFileSelectionBox.3 \
		639	XmVaCreateForm.3 \
		640	XmVaCreateFrame.3 \
		641	XmVaCreateHierarchy.3 \
		642	XmVaCreateIconGadget.3 \
		643	XmVaCreateLabel.3 \
		644	XmVaCreateLabelGadget.3 \
		645	XmVaCreateList.3 \
		646	XmVaCreateMainWindow.3 \
		647	XmVaCreateManagedArrowButton.3 \
		648	XmVaCreateManagedArrowButtonGadget.3 \
		649	XmVaCreateManagedBulletinBoard.3 \
		650	XmVaCreateManagedButtonBox.3 \
		651	XmVaCreateManagedCascadeButton.3 \
652	XmVaCreateManagedCascadeButtonGadget.3 \
653	XmVaCreateManagedColorSelector.3 \
654	XmVaCreateManagedColumn.3 \
655	XmVaCreateManagedCombinationBox2.3 \
656	XmVaCreateManagedComboBox.3 \
657	XmVaCreateManagedCommand.3 \
658	XmVaCreateManagedContainer.3 \
659	XmVaCreateManagedDataField.3 \
660	XmVaCreateManagedDrawingArea.3 \
661	XmVaCreateManagedDrawnButton.3 \
662	XmVaCreateManagedDropDown.3 \
663	XmVaCreateManagedExt18List.3 \
664	XmVaCreateManagedFileSelectionBox.3 \
665	XmVaCreateManagedForm.3 \
666	XmVaCreateManagedFrame.3 \
667	XmVaCreateManagedHierarchy.3 \
668	XmVaCreateManagedIconGadget.3 \
669	XmVaCreateManagedLabel.3 \
670	XmVaCreateManagedLabelGadget.3 \
671	XmVaCreateManagedList.3 \
672	XmVaCreateManagedMainWindow.3 \
673	XmVaCreateManagedMessageBox.3 \
674	XmVaCreateManagedMultiList.3 \
675	XmVaCreateManagedNotebook.3 \
676	XmVaCreateManagedOutline.3 \
677	XmVaCreateManagedPanedWindow.3 \
678	XmVaCreateManagedPushButton.3 \
679	XmVaCreateManagedPushButtonGadget.3 \
680	XmVaCreateManagedRowColumn.3 \
681	XmVaCreateManagedScale.3 \
682	XmVaCreateManagedScrollBar.3 \
683	XmVaCreateManagedScrolledWindow.3 \
684	XmVaCreateManagedSelectionBox.3 \
685	XmVaCreateManagedSeparatorGadget.3 \
686	XmVaCreateManagedSimpleSpinBox.3 \
687	XmVaCreateManagedSpinBox.3 \
688	XmVaCreateManagedTabStack.3 \
689	XmVaCreateManagedText.3 \
690	XmVaCreateManagedTextField.3 \
691	XmVaCreateManagedToggleButton.3 \
692	XmVaCreateManagedToggleButtonGadget.3 \
693	XmVaCreateMessageBox.3 \
694	XmVaCreateMultiList.3 \
695	XmVaCreateNotebook.3 \
696	XmVaCreateOutline.3 \
697	XmVaCreatePanedWindow.3 \
698	XmVaCreatePushButton.3 \
699	XmVaCreatePushButtonGadget.3 \
700	XmVaCreateRowColumn.3 \
701	XmVaCreateScale.3 \
702	XmVaCreateScrollBar.3 \
703	XmVaCreateScrolledWindow.3 \
704	XmVaCreateSelectionBox.3 \
705	XmVaCreateSeparatorGadget.3 \
706	XmVaCreateSimpleSpinBox.3 \
707	XmVaCreateSpinBox.3 \
708	XmVaCreateTabStack.3 \
709	XmVaCreateText.3 \
710	XmVaCreateTextField.3 \
711	XmVaCreateToggleButton.3 \
712	XmVaCreateToggleButtonGadget.3 \
597	XmWidgetGetDisplayRect.3	713	XmWidgetGetDisplayRect.3
598	MAN5= \	714	MAN5= \
599	Traits.5 \	715	Traits.5 \

Lines 1-11 Link Here

(-)open-motif/files/patch-doc::man::man5::Makefile.in (-10 / +10 lines)
1	--- doc/man/man5/Makefile.in.orig Tue Apr 6 13:50:28 2004	1	--- doc/man/man5/Makefile.in.orig 2011-01-16 02:23:56.000000000 +0300
2	+++ doc/man/man5/Makefile.in Thu Jul 29 21:21:55 2004	2	+++ doc/man/man5/Makefile.in 2011-01-16 02:24:21.000000000 +0300
3	@@ -95,7 +95,7 @@	3	@@ -234,7 +234,8 @@
		4	man_MANS = \
		5	Traits.5 \
		6	UIL.5 \
		7	- WML.5
		8	+ WML.5 \
		9	+ mwmrc.5
4		10
5	EXTRA_DIST = $(man_MANS)	11	all: all-am
6
7	-man_MANS = Traits.5 UIL.5 WML.5
8	+man_MANS = Traits.5 UIL.5 WML.5 mwmrc.5
9
10	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11	CONFIG_HEADER = ../../../include/config.h

Lines 1-16 Link Here

(-)open-motif/files/patch-lib::Mrm::MrmItop.c (-16 lines)
1	--- lib/Mrm/MrmItop.c~ Fri Jan 11 14:56:23 2002
2	+++ lib/Mrm/MrmItop.c Sun Nov 23 19:42:03 2003
3	@@ -642,10 +642,11 @@
4	* Local variables
5	*/
6	Cardinal result ; /* function results */
7	+ IDBResource resid ;
8
9	if ( (result=Idb__FIL_Valid((IDBFile)file_id)) != MrmSUCCESS ) return result ;
10	- result = Idb__RID_NextRID ((IDBFile)file_id,
11	- (IDBResource *)resource_id_return) ;
12	+ result = Idb__RID_NextRID ((IDBFile)file_id, &resid) ;
13	+ if ( result == MrmSUCCESS ) *resource_id_return = resid;
14	return result ;
15
16	}

Lines 1-22 Link Here

(-)open-motif/files/patch-lib::Xm::ColorS.c (-17 / +17 lines)
1	--- lib/Xm/ColorS.c.orig Mon Mar 24 09:01:49 2003	1	--- lib/Xm/ColorS.c.orig 2005-12-17 16:54:03.000000000 +0300
2	+++ lib/Xm/ColorS.c Mon Mar 24 09:02:44 2003	2	+++ lib/Xm/ColorS.c 2011-01-16 00:48:05.000000000 +0300
3	@@ -107,6 +107,10 @@	3	@@ -41,6 +41,10 @@
		4
		5	#define SUPERCLASS ((WidgetClass) &xmManagerClassRec)
4		6
5	#define offset(field) XmPartOffset(XmColorSelector, field)
6
7	+#ifndef LIBDIR	7	+#ifndef LIBDIR
8	+#define LIBDIR "/usr/lib/X11"	8	+#define LIBDIR "/usr/local/lib/X11"
9	+#endif	9	+#endif
10	+	10	+
11	static XmPartResource resources[] = {	11	/************************************************************
12	{ XmNcolorMode, XmCColorMode, XmRXmColorMode, sizeof(XmColorMode),	12	* MACROS
13	offset(color_mode), XmRImmediate, (XtPointer) XmScaleMode },	13	************************************************************/
14	@@ -117,7 +121,7 @@	14	@@ -131,7 +135,7 @@
15	offset(rgb_file), XmRString, (XtPointer) "sys$manager:decw$rgb.dat" },	15	{
16	#else	16	XmNrgbFile, XmCString, XmRString,
17	{ XmNrgbFile, XmCString, XmRString, sizeof(String),	17	sizeof(String), XtOffsetOf(XmColorSelectorRec, cs.rgb_file),
18	- offset(rgb_file), XmRString, (XtPointer) "/usr/lib/X11/rgb.txt" },	18	- XmRString, (XtPointer) "/usr/lib/X11/rgb.txt"
19	+ offset(rgb_file), XmRString, (XtPointer) LIBDIR"/rgb.txt" },	19	+ XmRString, (XtPointer) LIBDIR"/rgb.txt"
		20	},
20	#endif	21	#endif
21	{ XmNmarginWidth, XmCMargin, XmRHorizontalDimension,sizeof(Dimension),	22	{
22	offset(margin_width), XmRImmediate, (XtPointer) 2 },

Lines 1-14 Link Here

(-)open-motif/files/patch-ltmain.sh (-6 / +6 lines)
1	--- ltmain.sh.orig Wed Jan 23 10:32:07 2002	1	--- ltmain.sh.orig 2009-12-02 18:09:01.000000000 +0300
2	+++ ltmain.sh Wed Sep 4 03:36:57 2002	2	+++ ltmain.sh 2011-01-16 00:51:04.000000000 +0300
3	@@ -4365,10 +4365,12 @@	3	@@ -2077,10 +2077,12 @@
4	fi	4	fi
5		5
6	# Install the pseudo-library for information purposes.	6	# Install the pseudo-library for information purposes.
7	+ if /usr/bin/false; then	7	+ if /usr/bin/false; then
8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`	8	func_basename "$file"
		9	name="$func_basename_result"
9	instname="$dir/$name"i	10	instname="$dir/$name"i
10	$show "$install_prog $instname $destdir/$name"	11	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
12	+ fi	12	+ fi
13		13
14	# Maybe install the static library, too.	14	# Maybe install the static library, too.

Lines 1-186 Link Here

(-)open-motif/files/patch-security-1 (-186 lines)
1	--- lib/Xm/XpmAttrib.c.orig Sat Jan 1 17:44:26 2005
2	+++ lib/Xm/XpmAttrib.c Sat Jan 1 17:46:04 2005
3	@@ -58,6 +58,8 @@
4	XpmColor colorTable, color;
5	int a;
6
7	+ if (ncolors > INT_MAX/sizeof(XpmColor *))
8	+ return (XpmNoMemory);
9	colorTable = (XpmColor *) XpmMalloc(ncolors sizeof(XpmColor *));
10	if (!colorTable) {
11	*oldct = NULL;
12	--- lib/Xm/XpmCrDatFrI.c.orig Sat Jan 1 17:46:37 2005
13	+++ lib/Xm/XpmCrDatFrI.c Sat Jan 1 17:47:18 2005
14	@@ -134,6 +134,8 @@
15	*/
16	header_nlines = 1 + image->ncolors;
17	header_size = sizeof(char ) header_nlines;
18	+ if (header_size > INT_MAX/sizeof(char *))
19	+ return (XpmNoMemory);
20	header = (char *) XpmCalloc(header_size, sizeof(char ));
21	if (!header)
22	return (XpmNoMemory);
23	--- lib/Xm/XpmI.h.orig Sat Jan 1 17:47:36 2005
24	+++ lib/Xm/XpmI.h Sat Jan 1 17:47:53 2005
25	@@ -108,6 +108,7 @@
26	* lets try to solve include files
27	*/
28
29	+#include <limits.h>
30	#include <stdio.h>
31	#include <stdlib.h>
32	/* stdio.h doesn't declare popen on a Sequent DYNIX OS */
33	--- lib/Xm/Xpmcreate.c.orig Sat Jan 1 17:48:09 2005
34	+++ lib/Xm/Xpmcreate.c Sat Jan 1 17:51:23 2005
35	@@ -805,6 +805,8 @@
36	ErrorStatus = XpmSuccess;
37
38	/* malloc pixels index tables */
39	+ if (image->ncolors > INT_MAX/sizeof(Pixel))
40	+ return (XpmNoMemory);
41	image_pixels = (Pixel ) XpmMalloc(sizeof(Pixel) image->ncolors);
42	if (!image_pixels)
43	return (XpmNoMemory);
44	@@ -948,6 +950,10 @@
45
46	#ifndef FOR_MSW
47	/* now that bytes_per_line must have been set properly alloc data */
48	+ if (height != 0 && (*image_return)->bytes_per_line > INT_MAX/height) {
49	+ XDestroyImage(*image_return);
50	+ return (XpmNoMemory);
51	+ }
52	(*image_return)->data =
53	(char ) XpmMalloc((image_return)->bytes_per_line * height);
54
55	@@ -1992,6 +1998,8 @@
56	xpmGetCmt(data, &colors_cmt);
57
58	/* malloc pixels index tables */
59	+ if (ncolors > INT_MAX/sizeof(Pixel))
60	+ RETURN(XpmNoMemory);
61	image_pixels = (Pixel ) XpmMalloc(sizeof(Pixel) ncolors);
62	if (!image_pixels)
63	RETURN(XpmNoMemory);
64	@@ -2247,7 +2255,7 @@
65
66	/* array of pointers malloced by need */
67	unsigned short *cidx[256];
68	- int char1;
69	+ unsigned int char1;
70
71	bzero((char )cidx, 256 sizeof(unsigned short )); / init */
72	for (a = 0; a < ncolors; a++) {
73	--- lib/Xm/Xpmhashtab.c.orig Sat Jan 1 17:51:59 2005
74	+++ lib/Xm/Xpmhashtab.c Sat Jan 1 17:56:35 2005
75	@@ -150,6 +150,8 @@
76	HASH_TABLE_GROWS
77	table->size = size;
78	table->limit = size / 3;
79	+ if (size > INT_MAX/sizeof(*atomTable))
80	+ return (XpmNoMemory);
81	atomTable = (xpmHashAtom ) XpmMalloc(size sizeof(*atomTable));
82	if (!atomTable)
83	return (XpmNoMemory);
84	@@ -210,6 +212,8 @@
85	table->size = INITIAL_HASH_SIZE;
86	table->limit = table->size / 3;
87	table->used = 0;
88	+ if (table->size > INT_MAX/sizeof(*atomTable))
89	+ return (XpmNoMemory);
90	atomTable = (xpmHashAtom ) XpmMalloc(table->size sizeof(*atomTable));
91	if (!atomTable)
92	return (XpmNoMemory);
93	--- lib/Xm/Xpmparse.c.orig Sat Jan 1 17:53:31 2005
94	+++ lib/Xm/Xpmparse.c Sat Jan 1 17:56:33 2005
95	@@ -335,6 +335,8 @@
96	char **defaults;
97	int ErrorStatus;
98
99	+ if (ncolors > INT_MAX/sizeof(XpmColor))
100	+ return (XpmNoMemory);
101	colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
102	if (!colorTable)
103	return (XpmNoMemory);
104	@@ -346,6 +348,8 @@
105	/*
106	* read pixel value
107	*/
108	+ if (cpp > INT_MAX-1)
109	+ return (XpmNoMemory);
110	color->string = (char *) XpmMalloc(cpp + 1);
111	if (!color->string) {
112	xpmFreeColorTable(colorTable, ncolors);
113	@@ -428,6 +432,8 @@
114	/*
115	* read pixel value
116	*/
117	+ if (cpp > INT_MAX-1)
118	+ return (XpmNoMemory);
119	color->string = (char *) XpmMalloc(cpp + 1);
120	if (!color->string) {
121	xpmFreeColorTable(colorTable, ncolors);
122	@@ -490,6 +496,8 @@
123	unsigned int iptr, iptr2;
124	unsigned int a, x, y;
125
126	+ if (height != 0 && width > INT_MAX/sizeof(unsigned int))
127	+ return (XpmNoMemory);
128	#ifndef FOR_MSW
129	iptr2 = (unsigned int ) XpmMalloc(sizeof(unsigned int) width * height);
130	#else
131	@@ -543,7 +551,7 @@
132
133	/* array of pointers malloced by need */
134	unsigned short *cidx[256];
135	- int char1;
136	+ unsigned int char1;
137
138	bzero((char )cidx, 256 sizeof(unsigned short )); / init */
139	for (a = 0; a < ncolors; a++) {
140	--- lib/Xm/Xpmscan.c.orig Sat Jan 1 17:56:49 2005
141	+++ lib/Xm/Xpmscan.c Sat Jan 1 17:59:28 2005
142	@@ -225,11 +225,16 @@
143	else
144	cpp = 0;
145
146	+ if ((height != 0 && width > INT_MAX/height) \|\|
147	+ (width*height > INT_MAX/sizeof(unsigned int)))
148	+ RETURN(XpmNoMemory);
149	pmap.pixelindex =
150	(unsigned int ) XpmCalloc(width height, sizeof(unsigned int));
151	if (!pmap.pixelindex)
152	RETURN(XpmNoMemory);
153
154	+ if (pmap.size > INT_MAX/sizeof(Pixel))
155	+ RETURN(XpmNoMemory);
156	pmap.pixels = (Pixel ) XpmMalloc(sizeof(Pixel) pmap.size);
157	if (!pmap.pixels)
158	RETURN(XpmNoMemory);
159	@@ -284,7 +289,8 @@
160	* get rgb values and a string of char, and possibly a name for each
161	* color
162	*/
163	-
164	+ if (pmap.ncolors > INT_MAX/sizeof(XpmColor))
165	+ RETURN(XpmNoMemory);
166	colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
167	if (!colorTable)
168	RETURN(XpmNoMemory);
169	@@ -332,6 +338,8 @@
170
171	/* first get a character string */
172	a = 0;
173	+ if (cpp > INT_MAX-1)
174	+ return (XpmNoMemory);
175	if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
176	return (XpmNoMemory);
177	*s++ = printable[c = a % MAXPRINTABLE];
178	@@ -423,6 +431,8 @@
179	}
180
181	/* first get character strings and rgb values */
182	+ if (ncolors > INT_MAX/sizeof(XColor) \|\| cpp > INT_MAX-1)
183	+ return (XpmNoMemory);
184	xcolors = (XColor ) XpmMalloc(sizeof(XColor) ncolors);
185	if (!xcolors)
186	return (XpmNoMemory);

Lines 241-246 Link Here

(-)open-motif/pkg-plist (-3 / +6 lines)
241	include/Xm/ToggleBG.h	241	include/Xm/ToggleBG.h
242	include/Xm/ToggleBGP.h	242	include/Xm/ToggleBGP.h
243	include/Xm/ToggleBP.h	243	include/Xm/ToggleBP.h
		244	include/Xm/ToolTipCT.h
		245	include/Xm/ToolTipT.h
		246	include/Xm/XmStrDefs23.h
244	include/Xm/TraitP.h	247	include/Xm/TraitP.h
245	include/Xm/Transfer.h	248	include/Xm/Transfer.h
246	include/Xm/TransferP.h	249	include/Xm/TransferP.h
Lines 341-355 Link Here
341	lib/libMrm.a	344	lib/libMrm.a
342	lib/libMrm.la	345	lib/libMrm.la
343	lib/libMrm.so	346	lib/libMrm.so
344	lib/libMrm.so.3	347	lib/libMrm.so.4
345	lib/libUil.a	348	lib/libUil.a
346	lib/libUil.la	349	lib/libUil.la
347	lib/libUil.so	350	lib/libUil.so
348	lib/libUil.so.3	351	lib/libUil.so.4
349	lib/libXm.a	352	lib/libXm.a
350	lib/libXm.la	353	lib/libXm.la
351	lib/libXm.so	354	lib/libXm.so
352	lib/libXm.so.3	355	lib/libXm.so.4
353	%%MANUALS%%%%DOCSDIR%%/BUGREPORT	356	%%MANUALS%%%%DOCSDIR%%/BUGREPORT
354	%%MANUALS%%%%DOCSDIR%%/COPYRIGHT.MOTIF	357	%%MANUALS%%%%DOCSDIR%%/COPYRIGHT.MOTIF
355	%%MANUALS%%%%DOCSDIR%%/README	358	%%MANUALS%%%%DOCSDIR%%/README