dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #1114

This commit is contained in:
LemonBoy 2014-07-11 22:56:21 +02:00
parent 0d75530b72
commit d60d0d8805
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libr/hash/hash.c
View File

@ -109,38 +109,40 @@ R_API int r_hash_size(int bit) {
return 0;
}
/* Converts a comma separated list of names to the respective bit combination */
R_API ut64 r_hash_name_to_bits(const char *name) {
int i = 0, j, len = 0;
char name_lowercase[128];
const char* ptr = name_lowercase;
ut64 bits = R_HASH_NONE;
char tmp[128];
int i;
const char *ptr;
ut64 ret;
for (j=0;name[j] && j<sizeof (name_lowercase)-1; j++)
name_lowercase[j] = tolower (name[j]);
name_lowercase[j] = 0;
ret = 0;
ptr = name;
while (name_lowercase[i++]) {
len++;
if (name_lowercase[i] == ',') {
for (j=0; hash_name_bytes[j].name; j++) {
if (!strncmp (ptr, hash_name_bytes[j].name, len)) {
bits |= hash_name_bytes[j].bit;
break;
}
if (!ptr)
return ret;
do {
/* Eat everything up to the comma */
for (i = 0; *ptr && *ptr != ',' && i < sizeof (tmp) - 1; i++)
tmp[i] = *ptr++;
/* Safety net */
tmp[i] = '\0';
for (i = 0; hash_name_bytes[i].name; i++) {
if (!strcasecmp(tmp, hash_name_bytes[i].name)) {
ret |= hash_name_bytes[i].bit;
break;
}
ptr = name_lowercase + i + 1;
len = -1;
}
while (name_lowercase[i+1] == ' ') {
i++;
/* Skip the trailing comma, if any */
if (*ptr)
ptr++;
}
}
for (i=0; hash_name_bytes[i].name; i++) { //last word of the list
if (!strcmp (ptr, hash_name_bytes[i].name))
bits |= hash_name_bytes[i].bit;
}
return bits;
} while (*ptr);
return ret;
}
R_API void r_hash_do_spice(RHash *ctx, int algo, int loops, RHashSeed *seed) {

4
libr/io/io.c
View File

@ -16,7 +16,7 @@ static ut8 * r_io_desc_read (RIO *io, RIODesc * desc, ut64 *out_sz);
static RIO * r_io_bind_get_io(RIOBind *bnd);
R_API RIO *r_io_new() {
RIO *io = R_NEW (RIO);
RIO *io = R_NEW0 (RIO);
if (!io) return NULL;
io->buffer = r_cache_new (); // RCache is a list of ranged buffers. maybe rename?
io->buffer_enabled = 0;
@ -55,7 +55,7 @@ R_API int r_io_is_listener(RIO *io) {
}
R_API RBuffer *r_io_read_buf(RIO *io, ut64 addr, int len) {
RBuffer *b = R_NEW (RBuffer);
RBuffer *b = R_NEW0 (RBuffer);
b->buf = malloc (len);
len = r_io_read_at (io, addr, b->buf, len);
b->length = (len<0)?0:len;