diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/utils.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 688ad8d44..c3957f049 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-01-06 Mikael Magnusson <mikachu@gmail.com> + * 34138: Src/utils.c: wcs_nicechar: only deref widthp if it + was given + * 34120: Src/Zle/compctl.c, Src/jobs.c: Check contents instead of array diff --git a/Src/utils.c b/Src/utils.c index 72a0c9c1f..f8d239458 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -566,7 +566,7 @@ wcs_nicechar(wchar_t c, size_t *widthp, char **swidep) return buf; } if (swidep) - *swidep = buf + *widthp; + *swidep = widthp ? buf + *widthp : buf; return buf; } |