Bash-5.3 patch 14: update mapfile patch 11, removing stray line and improving the efficiency of the original fix

This commit is contained in:
Chet Ramey
2026-06-10 08:58:29 -04:00
parent 427d51d84d
commit a833685ecb
2 changed files with 10 additions and 10 deletions
+9 -9
View File
@@ -197,16 +197,16 @@ mapfile (int fd, long line_count_goal, long origin, long nskip, long callback_qu
zsyncfd (fd);
run_callback (callback, array_index, line);
/* Bad things can happen if the callback modifies ENTRY, e.g.,
unsetting it or changing it to a non-indexed-array type, so we
look it up again every time we need to assign something */
entry = bind_array_variable (array_name, array_index, line, 0);
if (entry == 0 || ASSIGN_DISALLOWED (entry, 0))
return EXECUTION_FAILURE;
}
/* Bad things can happen if the callback modifies ENTRY, e.g.,
unsetting it or changing it to a non-indexed-array type, so we
look it up again every time we need to assign something */
entry = bind_array_variable (array_name, array_index, line, 0);
if (entry == 0 || ASSIGN_DISALLOWED (entry, 0))
return EXECUTION_FAILURE;
bind_array_element (entry, array_index, line, 0);
else
bind_array_element (entry, array_index, line, 0);
/* Have we exceeded # of lines to store? */
line_count++;
+1 -1
View File
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 13
#define PATCHLEVEL 14
#endif /* _PATCHLEVEL_H_ */