MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

readStr and fuzzing.

Browse source
This commit is contained in:
treeform 2022-05-20 18:12:13 -07:00
parent 6ebd493f94
commit 0f2c937895
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pixie.nimble
View file

@ -9,7 +9,7 @@ requires "nim >= 1.4.8"
requires "vmath >= 1.1.4" requires "vmath >= 1.1.4"
requires "chroma >= 0.2.5" requires "chroma >= 0.2.5"
requires "zippy >= 0.9.7" requires "zippy >= 0.9.7"
requires "flatty >= 0.3.2" requires "flatty >= 0.3.3"
requires "nimsimd >= 1.0.0" requires "nimsimd >= 1.0.0"
requires "bumpy >= 1.1.1" requires "bumpy >= 1.1.1"

12
src/pixie/fileformats/jpeg.nim
View file

@ -119,6 +119,13 @@ proc readUint32be(state: var DecoderState): uint32 =
(state.readUint8().uint32 shl 8) or (state.readUint8().uint32 shl 8) or
state.readUint8().uint32 state.readUint8().uint32
proc readStr(state: var DecoderState, n: int): string =
## Reads n number of bytes as a string.
if state.pos + n > state.buffer.len:
failInvalid()
result = state.buffer[state.pos ..< state.pos + n]
state.pos += n
proc skipBytes(state: var DecoderState, n: int) = proc skipBytes(state: var DecoderState, n: int) =
## Skips a number of bytes. ## Skips a number of bytes.
if state.pos + n > state.buffer.len: if state.pos + n > state.buffer.len:
@ -329,8 +336,7 @@ proc decodeExif(state: var DecoderState) =
len = state.readUint16be().int - 2 len = state.readUint16be().int - 2
endOffset = state.pos + len endOffset = state.pos + len
let exifHeader = state.buffer[state.pos ..< state.pos + 6] let exifHeader = state.readStr(6)
state.skipBytes(6)
if exifHeader != "Exif\0\0": if exifHeader != "Exif\0\0":
# Happens with progressive images, just ignore instead of error. # Happens with progressive images, just ignore instead of error.
# Skip to the end. # Skip to the end.
@ -519,7 +525,7 @@ proc getBit(state: var DecoderState): int =
proc getBitsAsSignedInt(state: var DecoderState, n: int): int = proc getBitsAsSignedInt(state: var DecoderState, n: int): int =
## Get n number of bits as a signed integer. ## Get n number of bits as a signed integer.
if n notin 0 .. 16: if n notin 0 .. 15:
failInvalid() failInvalid()
if state.bitsBuffered < n: if state.bitsBuffered < n:
state.fillBitBuffer() state.fillBitBuffer()

2
src/pixie/images.nim
View file

@ -172,7 +172,7 @@ proc flipVertical*(image: Image) {.raises: [].} =
proc rotate90*(image: Image) {.raises: [PixieError].} = proc rotate90*(image: Image) {.raises: [PixieError].} =
## Rotates the image 90 degrees clockwise. ## Rotates the image 90 degrees clockwise.
var copy = newImage(image.height, image.width) let copy = newImage(image.height, image.width)
for y in 0 ..< copy.height: for y in 0 ..< copy.height:
for x in 0 ..< copy.width: for x in 0 ..< copy.width:
copy.data[copy.dataIndex(x, y)] = copy.data[copy.dataIndex(x, y)] =