LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-4.4 patch 6

Browse Source
This commit is contained in:
Chet Ramey
2017-01-20 11:47:31 -05:00
parent f459cbd8be
commit 44bfefc553
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtins/pushd.def
View File

@@ -365,7 +365,7 @@ popd_builtin (list)
break; break;
} }
if (which > directory_list_offset || (directory_list_offset == 0 && which == 0)) if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
{ {
pushd_error (directory_list_offset, which_word ? which_word : ""); pushd_error (directory_list_offset, which_word ? which_word : "");
return (EXECUTION_FAILURE); return (EXECUTION_FAILURE);
@@ -387,6 +387,11 @@ popd_builtin (list)
remove that directory from the list and shift the remainder remove that directory from the list and shift the remainder
of the list into place. */ of the list into place. */
i = (direction == '+') ? directory_list_offset - which : which; i = (direction == '+') ? directory_list_offset - which : which;
if (i < 0 || i > directory_list_offset)
{
pushd_error (directory_list_offset, which_word ? which_word : "");
return (EXECUTION_FAILURE);
}
free (pushd_directory_list[i]); free (pushd_directory_list[i]);
directory_list_offset--; directory_list_offset--;

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 5 #define PATCHLEVEL 6
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */