mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Ryan Schmidt
ff99d25c31
git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@81682 d073be05-634f-4543-b044-5fe20cf6d1d6
30 lines
875 B
C
30 lines
875 B
C
--- src/motifutils.c.orig 2011-08-04 11:11:51.000000000 +0200
|
|
+++ src/motifutils.c 2011-08-04 10:57:01.000000000 +0200
|
|
@@ -121,7 +121,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++;
|
|
}
|
|
@@ -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++;
|
|
}
|
|
@@ -1294,7 +1294,7 @@
|
|
XmNlabelString, str,
|
|
XmNmnemonic, mnemonic,
|
|
XmNsubMenuId, menu,
|
|
- 0);
|
|
+ (char *)NULL);
|
|
XmStringFree(str);
|
|
if (help_anchor) {
|
|
XtAddCallback(menu, XmNhelpCallback, (XtCallbackProc) HelpCB,
|