Skip to content

Fix buffer size to ensure #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
komamitsu merged 2 commits into from
Apr 9, 2015
Merged

Fix buffer size to ensure #216

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b15e18f
Fix buffer size to ensure
xerial Apr 8, 2015
a4c9593
Avoid allocating too large bufffer when unpacking string
xerial Apr 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix buffer size to ensure
  • Loading branch information
@xerial
xerial committed Apr 8, 2015
commit b15e18fd761869227926031d46de15f2ecf2a1d2
2 changes: 1 addition & 1 deletion msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ public String unpackString() throws IOException {
decodeBuffer.clear();
StringBuilder sb = new StringBuilder();
while(cursor < strLen) {
if (!ensure(strLen))
if (!ensure(strLen-cursor))
throw new EOFException();

int readLen = Math.min(buffer.size() - position, strLen-cursor);
Copy link
Copy Markdown
Member

@komamitsu komamitsu Apr 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ensure(int byteSizeToRead) looks to guarantee to prepare a buffer requested as byteSizeToRead. So readLen should be simply strLen - cursor? If so, maybe we can remove the outer loop.

Copy link
Copy Markdown
Member Author

@xerial xerial Apr 9, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like so. i'll remove it

Expand Down