projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test commit (spelling correction)
[oota-llvm.git]
/
lib
/
Support
/
StringRefMemoryObject.cpp
diff --git
a/lib/Support/StringRefMemoryObject.cpp
b/lib/Support/StringRefMemoryObject.cpp
index 5db11e918cd634d1e2ab7d319952f11d55230f9c..e035ed1d2ef31fd69a85b3e454a0647eafdca46f 100644
(file)
--- a/
lib/Support/StringRefMemoryObject.cpp
+++ b/
lib/Support/StringRefMemoryObject.cpp
@@
-20,15
+20,10
@@
int StringRefMemoryObject::readByte(uint64_t Addr, uint8_t *Byte) const {
int StringRefMemoryObject::readBytes(uint64_t Addr,
uint64_t Size,
int StringRefMemoryObject::readBytes(uint64_t Addr,
uint64_t Size,
- uint8_t *Buf,
- uint64_t *Copied) const {
- if (Addr >= Base + getExtent() || Addr < Base)
- return -1;
+ uint8_t *Buf) const {
uint64_t Offset = Addr - Base;
uint64_t Offset = Addr - Base;
- if (
Size > getExtent() - Offset
)
-
Size = getExtent() - Offset
;
+ if (
Addr >= Base + getExtent() || Offset + Size > getExtent() || Addr < Base
)
+
return -1
;
memcpy(Buf, Bytes.data() + Offset, Size);
memcpy(Buf, Bytes.data() + Offset, Size);
- if (Copied)
- *Copied = Size;
return 0;
}
return 0;
}