 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.643 2020/11/02 16:48:49 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.644 2020/11/02 16:55:18 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -120,27 +120,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.643 2020/11/02 16:48:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.644 2020/11/02 16:55:18 rillig Exp $");
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 @@ -3262,56 +3262,52 @@ typedef enum ApplyModifiersIndirectResul
     AMIR_APPLY_MODS,
     AMIR_OUT
 } ApplyModifiersIndirectResult;
 /* While expanding a variable expression, expand and apply indirect
  * modifiers. */
 static ApplyModifiersIndirectResult
 ApplyModifiersIndirect(
 	ApplyModifiersState *const st,
 	const char **inout_p,
 	void **const out_freeIt
 ) {
     const char *p = *inout_p;
     const char *nested_p = p;
     const char *mods;
     void *mods_freeIt;
-    (void)Var_Parse(&nested_p, st->ctxt, st->eflags, &mods, &mods_freeIt);
+    (void)Var_Parse(&p, st->ctxt, st->eflags, &mods, &mods_freeIt);
     /* TODO: handle errors */
     /*
      * If we have not parsed up to st->endc or ':', we are not
      * interested.  This means the expression ${VAR:${M_1}${M_2}}
      * is not accepted, but ${VAR:${M_1}:${M_2}} is.
      */
-    if (mods[0] != '\0' &&
+    if (mods[0] != '\0' && *p != '\0' && *p != ':' && *p != st->endc) {
 	*nested_p != '\0' && *nested_p != ':' && *nested_p != st->endc) {
 	if (DEBUG(LINT))
 	    Parse_Error(PARSE_FATAL,
 			"Missing delimiter ':' after indirect modifier \"%.*s\"",
-			(int)(nested_p - p), p);
+			(int)(p - *inout_p), *inout_p);
 	free(mods_freeIt);
 	/* XXX: apply_mods doesn't sound like "not interested". */
 	/* XXX: Why is the indirect modifier parsed again by
 	 * apply_mods?  If any, p should be advanced to nested_p. */
 	return AMIR_APPLY_MODS;
+    }
     VAR_DEBUG3("Indirect modifier \"%s\" from \"%.*s\"\n",
-	       mods, (int)(size_t)(nested_p - p), p);
+	       mods, (int)(p - *inout_p), *inout_p);
     p = nested_p;
     if (mods[0] != '\0') {
 	const char *rval_pp = mods;
 	st->val = ApplyModifiers(&rval_pp, st->val, '\0', '\0', st->v,
 				&st->exprFlags, st->ctxt, st->eflags, out_freeIt);
 	if (st->val == var_Error
 	    || (st->val == varUndefined && !(st->eflags & VARE_UNDEFERR))
 	    || *rval_pp != '\0') {
 	    free(mods_freeIt);
 	    *inout_p = p;
 	    return AMIR_OUT;	/* error already reported */
+	}
+    }