diff options
author | sin <sin@2f30.org> | 2015-04-15 09:43:06 +0100 |
---|---|---|
committer | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2015-04-15 10:51:00 +0200 |
commit | 56abffb4b67f235d20de30f29ba027ab34c171e3 (patch) | |
tree | c79d48f0f624a6f8ffcb9a96dddedf8cf84bd57d | |
parent | aff35af275cb82eb876630c9256298ea1d1b2b57 (diff) | |
download | st-patched-56abffb4b67f235d20de30f29ba027ab34c171e3.tar.bz2 st-patched-56abffb4b67f235d20de30f29ba027ab34c171e3.tar.xz st-patched-56abffb4b67f235d20de30f29ba027ab34c171e3.zip |
Fix memmove() invocation with src/dst being NULL
This fixes a segmentation fault on some systems.
-rw-r--r-- | st.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -2788,8 +2788,11 @@ tresize(int col, int row) { | |||
2788 | free(term.line[i]); | 2788 | free(term.line[i]); |
2789 | free(term.alt[i]); | 2789 | free(term.alt[i]); |
2790 | } | 2790 | } |
2791 | memmove(term.line, term.line + i, row * sizeof(Line)); | 2791 | /* ensure that both src and dst are not NULL */ |
2792 | memmove(term.alt, term.alt + i, row * sizeof(Line)); | 2792 | if (i > 0) { |
2793 | memmove(term.line, term.line + i, row * sizeof(Line)); | ||
2794 | memmove(term.alt, term.alt + i, row * sizeof(Line)); | ||
2795 | } | ||
2793 | for(i += row; i < term.row; i++) { | 2796 | for(i += row; i < term.row; i++) { |
2794 | free(term.line[i]); | 2797 | free(term.line[i]); |
2795 | free(term.alt[i]); | 2798 | free(term.alt[i]); |