Bash-5.3 patch 14: update mapfile patch 11, removing stray line and improving the...

diff --git a/builtins/mapfile.def b/builtins/mapfile.def
index 71fb8196b74206f2d1ddaede8a6d1f0745fc2057..662dba23e3dde201fefb2e39b106954242cb6731 100644 (file)
--- a/builtins/mapfile.def
+++ b/builtins/mapfile.def
@@ -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;
 
-      bind_array_element (entry, array_index, line, 0);
+         /* 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;
+       }
+      else
+       bind_array_element (entry, array_index, line, 0);
 
       /* Have we exceeded # of lines to store? */
       line_count++;

diff --git a/patchlevel.h b/patchlevel.h
index 492f98f75ef4482c6ef2b93c667e3f73a3d61330..79e18af40bcf27391cf24dff4555a5837e2c8b7a 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -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_ */