[78231] trunk/dports/math/xmgr

[jmr at macports.org]

Revision: 78231
          http://trac.macports.org/changeset/78231
Author:   jmr at macports.org
Date:     2011-04-29 07:34:48 -0700 (Fri, 29 Apr 2011)
Log Message:
-----------
xmgr: fix another 64-bit crash (#29317)

Modified Paths:
--------------
    trunk/dports/math/xmgr/Portfile
    trunk/dports/math/xmgr/files/patch-motifutils.c

Modified: trunk/dports/math/xmgr/Portfile
===================================================================
--- trunk/dports/math/xmgr/Portfile	2011-04-29 03:35:47 UTC (rev 78230)
+++ trunk/dports/math/xmgr/Portfile	2011-04-29 14:34:48 UTC (rev 78231)
@@ -4,6 +4,7 @@
 
 name                xmgr
 version             4.1.2
+revision            1
 categories          math science
 maintainers         mac.com:mlund
 description         ACE/gr 2D plotting tool (Ancestor to Grace)

Modified: trunk/dports/math/xmgr/files/patch-motifutils.c
===================================================================
--- trunk/dports/math/xmgr/files/patch-motifutils.c	2011-04-29 03:35:47 UTC (rev 78230)
+++ trunk/dports/math/xmgr/files/patch-motifutils.c	2011-04-29 14:34:48 UTC (rev 78231)
@@ -1,5 +1,5 @@
---- src/motifutils.c	2011-01-30 19:39:41.000000000 +0100
-+++ src/motifutils.c	2011-01-30 19:39:47.000000000 +0100
+--- src/motifutils.c.orig	2011-01-30 19:39:41.000000000 +0100
++++ src/motifutils.c	2011-04-29 14:00:06.000000000 +0200
 @@ -121,7 +121,7 @@
  
      i = 0;
@@ -9,3 +9,12 @@
  	retval[i + 2] = XmCreatePushButton(retval[1], s, NULL, 0);
  	i++;
      }
+@@ -169,7 +169,7 @@
+     i = 0;
+ 
+     va_start(var, nchoices);
+-    while ((s = va_arg(var, char *)) != NULL) {
++    while ((s = va_arg(var, char *)) != NULL && i<nchoices) {
+ 	retval[i + 2] = XmCreatePushButton(retval[1], s, NULL, 0);
+ 	i++;
+     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110429/b8a4d95d/attachment.html>