git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7defd9d
)
fixed bug in reader_memread()
author
kramm
<kramm>
Wed, 12 Mar 2008 19:12:45 +0000
(19:12 +0000)
committer
kramm
<kramm>
Wed, 12 Mar 2008 19:12:45 +0000
(19:12 +0000)
lib/bitio.c
patch
|
blob
|
history
diff --git
a/lib/bitio.c
b/lib/bitio.c
index
8d17006
..
10b7a47
100644
(file)
--- a/
lib/bitio.c
+++ b/
lib/bitio.c
@@
-89,15
+89,12
@@
static int reader_memread(reader_t*reader, void* data, int len)
{
struct memread_t*mr = (struct memread_t*)reader->internal;
{
struct memread_t*mr = (struct memread_t*)reader->internal;
- if(mr->length - reader->pos > len) {
- memcpy(data, &mr->data[reader->pos], len);
- reader->pos += len;
- return len;
- } else {
- memcpy(data, &mr->data[reader->pos], mr->length - reader->pos);
- reader->pos += mr->length;
- return mr->length - reader->pos;
+ if(mr->length - reader->pos < len) {
+ len = mr->length - reader->pos;
}
}
+ memcpy(data, &mr->data[reader->pos], len);
+ reader->pos += len;
+ return len;
}
static void reader_memread_dealloc(reader_t*reader)
{
}
static void reader_memread_dealloc(reader_t*reader)
{