Skip to content

Cap container preallocation instead of wrapping #37

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

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cap container preallocation instead of wrapping #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions ext/cbor/unpacker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

/* work around https://bugs.ruby-lang.org/issues/15779 for now
* by limiting preallocation to about a half a Mebibyte
* limit is 2**n-1 (n==16) items so we can avoid a conditional
* limit is 2**n-1 (n==16) items
*/
#define SANE_PREALLOCATION_MAX 0xFFFFUL
#define SANE_PREALLOCATE(n) (n & SANE_PREALLOCATION_MAX)
#define SANE_PREALLOCATE(n) ((n) > SANE_PREALLOCATION_MAX ? SANE_PREALLOCATION_MAX : (n))

#if !defined(DISABLE_RMEM) && !defined(DISABLE_UNPACKER_STACK_RMEM) && \
MSGPACK_UNPACKER_STACK_CAPACITY * MSGPACK_UNPACKER_STACK_SIZE <= MSGPACK_RMEM_PAGE_SIZE
Expand Down Expand Up @@ -773,4 +773,3 @@ int msgpack_unpacker_skip_nil(msgpack_unpacker_t* uk)
}
return 0;
}