Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-03-05 04:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Workaround for the famous io/ff, this is not a final fix

Browse Source
This commit is contained in:
pancake 2014-05-18 02:37:34 +02:00
parent 2494e22a4d
commit b7eaf03813
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libr/io/io.c
View File

@ -341,6 +341,12 @@ eprintf ("RETRERET\n");
#endif
w += l;
len -= l;
/* Fix famous io/f bug */
#if 0
this is not a real fix, because it just avoids reading again , even if the seek returns error.
bear in mind that we need to fix that loop and honor lseek sections and sio maps fine
#endif
break;
}
return olen;
}

20
libr/io/p/io_default.c
View File

@ -123,6 +123,10 @@ static int r_io_def_mmap_read(RIO *io, RIODesc *fd, ut8 *buf, int count) {
RIOMMapFileObj *mmo = NULL;
if (!fd || !fd->data || !buf)
return -1;
if (io->off==UT64_MAX) {
memset (buf, 0xff, count);
return count;
}
mmo = fd->data;
if (mmo->rawio) {
return read (mmo->fd, buf, count);
@ -164,26 +168,26 @@ static RIODesc *r_io_def_mmap_open(RIO *io, const char *file, int flags, int mod
}
static ut64 r_io_def_mmap_seek(RIO *io, RIOMMapFileObj *mmo, ut64 offset, int whence) {
ut64 seek_val;
ut64 seek_val = UT64_MAX;
if (!mmo) return UT64_MAX;
if (mmo->rawio)
return lseek (mmo->fd, offset, whence);
seek_val = mmo->buf->cur;
if (mmo->buf)
seek_val = mmo->buf->cur;
switch (whence) {
case SEEK_SET:
seek_val = (mmo->buf->length < offset) ?
mmo->buf->length : offset;
mmo->buf->cur = io->off = seek_val;
return seek_val;
break;
case SEEK_CUR:
seek_val = (mmo->buf->length < (offset + mmo->buf->cur)) ?
mmo->buf->length : offset + mmo->buf->cur;
mmo->buf->cur = io->off = seek_val;
return seek_val;
break;
case SEEK_END:
seek_val = mmo->buf->length;
mmo->buf->cur = io->off = seek_val;
return seek_val;
break;
}
mmo->buf->cur = io->off = seek_val;
return seek_val;
}