diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2015-01-06 02:09:35 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2015-01-06 23:51:18 +0100 |
| commit | 4701b05cf760fddeee4b203f04130540f2d903a8 (patch) | |
| tree | c1cee771e40ac79f35eeb7938e4b58ac7fc191a5 | |
| parent | 38dc59907b50f1717b3634ab3a99499a52819e3f (diff) | |
| download | zsh-4701b05cf760fddeee4b203f04130540f2d903a8.tar.gz zsh-4701b05cf760fddeee4b203f04130540f2d903a8.tar.xz zsh-4701b05cf760fddeee4b203f04130540f2d903a8.zip | |
34138: wcs_nicechar: only deref widthp if it was given
| -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; } |