diff options
| author | Mike Baker <mbm@openwrt.org> | 2008-10-29 13:46:28 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2008-10-29 13:46:28 +0000 |
| commit | f9ce7a4e7c8821d8a74679f1a0a9c7d807363d17 (patch) | |
| tree | 35d6f797b086e5f3a5d633c7aa3d2804615dc278 /package/busybox | |
| parent | e8fe824c616313f0c69a37775e458ac82bee79d7 (diff) | |
| download | upstream-f9ce7a4e7c8821d8a74679f1a0a9c7d807363d17.tar.gz upstream-f9ce7a4e7c8821d8a74679f1a0a9c7d807363d17.tar.bz2 upstream-f9ce7a4e7c8821d8a74679f1a0a9c7d807363d17.zip | |
fix a null pointer deref in vi's search
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13073 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/patches/480-vi_search.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/busybox/patches/480-vi_search.patch b/package/busybox/patches/480-vi_search.patch new file mode 100644 index 0000000000..d9fa821e47 --- /dev/null +++ b/package/busybox/patches/480-vi_search.patch @@ -0,0 +1,35 @@ +--- a/editors/vi.c ++++ b/editors/vi.c +@@ -3313,7 +3313,7 @@ + buf[1] = '\0'; + q = get_input_line(buf); // get input line- use "status line" + if (q[0] && !q[1]) { +- if (last_search_pattern[0]) ++ if (last_search_pattern) + last_search_pattern[0] = c; + goto dc3; // if no pat re-use old pat + } +@@ -3329,6 +3329,10 @@ + if (cmdcnt-- > 1) { + do_cmd(c); + } // repeat cnt ++ if (last_search_pattern == 0) { ++ msg = "No previous regular expression"; ++ goto dc2; ++ } + dir = BACK; // assume BACKWARD search + p = dot - 1; + if (last_search_pattern[0] == '?') { +@@ -3348,10 +3352,8 @@ + msg = "No previous regular expression"; + goto dc2; + } +- if (last_search_pattern[0] == '/') { +- dir = FORWARD; // assume FORWARD search +- p = dot + 1; +- } ++ dir = FORWARD; // assume FORWARD search ++ p = dot + 1; + if (last_search_pattern[0] == '?') { + dir = BACK; + p = dot - 1; |