diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-06-21 13:10:40 -0700 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-06-21 16:10:40 -0400 |
| commit | 8526739066ccb00ccd24b74650a7d7b284442985 (patch) | |
| tree | 282512ae2ad95c98a9ca82de304a410b6b56685c /vendor/github.com/rwcarlsen/goexif/tiff/tag.go | |
| parent | a59ccaa8b3844895dde3980e6224fef46ff4a1c8 (diff) | |
| download | chat-8526739066ccb00ccd24b74650a7d7b284442985.tar.gz chat-8526739066ccb00ccd24b74650a7d7b284442985.tar.bz2 chat-8526739066ccb00ccd24b74650a7d7b284442985.zip | |
MM-10934 Update server dependencies. (#8981)
* Changing throttled import path.
* Upgrading dependencies.
Diffstat (limited to 'vendor/github.com/rwcarlsen/goexif/tiff/tag.go')
| -rw-r--r-- | vendor/github.com/rwcarlsen/goexif/tiff/tag.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vendor/github.com/rwcarlsen/goexif/tiff/tag.go b/vendor/github.com/rwcarlsen/goexif/tiff/tag.go index 95d4b28b8..b9ce791f5 100644 --- a/vendor/github.com/rwcarlsen/goexif/tiff/tag.go +++ b/vendor/github.com/rwcarlsen/goexif/tiff/tag.go @@ -179,8 +179,15 @@ func (t *Tag) convertVals() error { switch t.Type { case DTAscii: - if len(t.Val) > 0 { - t.strVal = string(t.Val[:len(t.Val)-1]) // ignore the last byte (NULL). + if len(t.Val) <= 0 { + break + } + nullPos := bytes.IndexByte(t.Val, 0) + if nullPos == -1 { + t.strVal = string(t.Val) + } else { + // ignore all trailing NULL bytes, in case of a broken t.Count + t.strVal = string(t.Val[:nullPos]) } case DTByte: var v uint8 |