GOMODULES
/
go-exif
mirror of https://github.com/dsoprea/go-exif.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ifd_enumerate: Bugfix for incorrect read semantics. 

- ...to make sure we get the right number of bytes.
pull/3/head
Dustin Oprea 2018-09-16 03:42:48 -04:00
parent 811286316f
commit ab09051aaa
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ifd_enumerate.go
View File

@ -57,10 +57,16 @@ func (ife *IfdTagEnumerator) getUint16() (value uint16, raw []byte, err error) {
}
}()
raw = make([]byte, 2)
needBytes := 2
offset := 0
raw = make([]byte, needBytes)
_, err = ife.buffer.Read(raw)
log.PanicIf(err)
for offset < needBytes {
n, err := ife.buffer.Read(raw[offset:])
log.PanicIf(err)
offset += n
}
if ife.byteOrder == binary.BigEndian {
value = binary.BigEndian.Uint16(raw)
@ -81,10 +87,16 @@ func (ife *IfdTagEnumerator) getUint32() (value uint32, raw []byte, err error) {
}
}()
raw = make([]byte, 4)
needBytes := 4
offset := 0
raw = make([]byte, needBytes)
_, err = ife.buffer.Read(raw)
log.PanicIf(err)
for offset < needBytes {
n, err := ife.buffer.Read(raw[offset:])
log.PanicIf(err)
offset += n
}
if ife.byteOrder == binary.BigEndian {
value = binary.BigEndian.Uint32(raw)