Index: main/astobj2.c===================================================================--- main/astobj2.c (revision 238997)+++ main/astobj2.c (working copy)@@ -731,9 +731,10 @@ ast_free(cur); /* free the link record */ }- if ((match & CMP_STOP) || (multi_container == NULL)) {- /* We found the only match we need */- i = last; /* force exit from outer loop */+ if ((match & CMP_STOP) ||+ ((flags & (OBJ_MULTIPLE | OBJ_NODATA)) == OBJ_MULTIPLE && multi_container == NULL)) {+ /* Force exit from outside loop */+ i = last; break; } }