dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-08-29 07:12:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Add fbounds-safety annotations for VP8LBitWriter." into main

Browse Source
This commit is contained in:
James Zern
2025-08-19 11:55:47 -07:00
committed by Gerrit Code Review
parent 603d4055bc 30b2c593c9
commit 9d690dbf06
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/utils/bit_writer_utils.c
View File

@@ -204,7 +204,7 @@ void VP8BitWriterWipeOut(VP8BitWriter* const bw) {
// Returns 1 on success. // Returns 1 on success.
static int VP8LBitWriterResize(VP8LBitWriter* const bw, size_t extra_size) { static int VP8LBitWriterResize(VP8LBitWriter* const bw, size_t extra_size) {
uint8_t* allocated_buf; uint8_t* WEBP_BIDI_INDEXABLE allocated_buf;
size_t allocated_size; size_t allocated_size;
const size_t max_bytes = bw->end - bw->buf; const size_t max_bytes = bw->end - bw->buf;
const size_t current_size = bw->cur - bw->buf; const size_t current_size = bw->cur - bw->buf;
@@ -219,7 +219,8 @@ static int VP8LBitWriterResize(VP8LBitWriter* const bw, size_t extra_size) {
if (allocated_size < size_required) allocated_size = size_required; if (allocated_size < size_required) allocated_size = size_required;
// make allocated size multiple of 1k // make allocated size multiple of 1k
allocated_size = (((allocated_size >> 10) + 1) << 10); allocated_size = (((allocated_size >> 10) + 1) << 10);
allocated_buf = (uint8_t*)WebPSafeMalloc(1ULL, allocated_size); allocated_buf = (uint8_t*)WEBP_UNSAFE_FORGE_BIDI_INDEXABLE(
void*, WebPSafeMalloc(1ULL, allocated_size), allocated_size);
if (allocated_buf == NULL) { if (allocated_buf == NULL) {
bw->error = 1; bw->error = 1;
return 0; return 0;
@@ -229,8 +230,8 @@ static int VP8LBitWriterResize(VP8LBitWriter* const bw, size_t extra_size) {
} }
WebPSafeFree(bw->buf); WebPSafeFree(bw->buf);
bw->buf = allocated_buf; bw->buf = allocated_buf;
bw->cur = bw->buf + current_size; bw->end = allocated_buf + allocated_size;
bw->end = bw->buf + allocated_size; bw->cur = allocated_buf + current_size;
return 1; return 1;
} }

10
src/utils/bit_writer_utils.h
View File

@@ -93,11 +93,11 @@ typedef uint16_t vp8l_wtype_t;
#endif #endif
typedef struct { typedef struct {
vp8l_atype_t bits; // bit accumulator vp8l_atype_t bits; // bit accumulator
int used; // number of bits used in accumulator int used; // number of bits used in accumulator
uint8_t* buf; // start of buffer uint8_t* WEBP_ENDED_BY(end) buf; // start of buffer
uint8_t* cur; // current write position uint8_t* WEBP_UNSAFE_INDEXABLE cur; // current write position
uint8_t* end; // end of buffer uint8_t* end; // end of buffer
// After all bits are written (VP8LBitWriterFinish()), the caller must observe // After all bits are written (VP8LBitWriterFinish()), the caller must observe
// the state of 'error'. A value of 1 indicates that a memory allocation // the state of 'error'. A value of 1 indicates that a memory allocation