Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-13 07:57:35 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Add some more safety checks for RBuffer

Browse Source
This commit is contained in:
pancake 2014-10-28 18:18:30 +01:00
parent e5de1a3ae7
commit 8aa76e644c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libr/util/buf.c
View File

@ -104,16 +104,17 @@ R_API char *r_buf_to_string(RBuffer *b) {
} }
R_API int r_buf_append_bytes(RBuffer *b, const ut8 *buf, int length) { R_API int r_buf_append_bytes(RBuffer *b, const ut8 *buf, int length) {
if (!b) return R_FALSE;
if (b->empty) b->length = b->empty = 0; if (b->empty) b->length = b->empty = 0;
if (!(b->buf = realloc (b->buf, b->length+length))) if (!(b->buf = realloc (b->buf, b->length+length)))
return R_FALSE; return R_FALSE;
memmove (b->buf+b->length, buf, length); memmove (b->buf+b->length, buf, length);
b->length += length; b->length += length;
return R_TRUE; return R_TRUE;
} }
R_API int r_buf_append_nbytes(RBuffer *b, int length) { R_API int r_buf_append_nbytes(RBuffer *b, int length) {
if (!b) return R_FALSE;
if (b->empty) b->length = b->empty = 0; if (b->empty) b->length = b->empty = 0;
if (!(b->buf = realloc (b->buf, b->length+length))) if (!(b->buf = realloc (b->buf, b->length+length)))
return R_FALSE; return R_FALSE;
@ -123,6 +124,7 @@ R_API int r_buf_append_nbytes(RBuffer *b, int length) {
} }
R_API int r_buf_append_ut16(RBuffer *b, ut16 n) { R_API int r_buf_append_ut16(RBuffer *b, ut16 n) {
if (!b) return R_FALSE;
if (b->empty) b->length = b->empty = 0; if (b->empty) b->length = b->empty = 0;
if (!(b->buf = realloc (b->buf, b->length+sizeof (n)))) if (!(b->buf = realloc (b->buf, b->length+sizeof (n))))
return R_FALSE; return R_FALSE;
@ -141,6 +143,7 @@ R_API int r_buf_append_ut32(RBuffer *b, ut32 n) {
} }
R_API int r_buf_append_ut64(RBuffer *b, ut64 n) { R_API int r_buf_append_ut64(RBuffer *b, ut64 n) {
if (!b) return R_FALSE;
if (b->empty) b->length = b->empty = 0; if (b->empty) b->length = b->empty = 0;
if (!(b->buf = realloc (b->buf, b->length+sizeof (n)))) if (!(b->buf = realloc (b->buf, b->length+sizeof (n))))
return R_FALSE; return R_FALSE;
@ -150,6 +153,7 @@ R_API int r_buf_append_ut64(RBuffer *b, ut64 n) {
} }
R_API int r_buf_append_buf(RBuffer *b, RBuffer *a) { R_API int r_buf_append_buf(RBuffer *b, RBuffer *a) {
if (!b) return R_FALSE;
if (b->empty) { if (b->empty) {
b->length = 0; b->length = 0;
b->empty = 0; b->empty = 0;