Skip to content

Fix remaining buffer size in vendored storage commands #13

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
evaccaro merged 3 commits into from
Oct 19, 2026
+33 −2
Merged

Fix remaining buffer size in vendored storage commands #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b96734
Fix remaining buffer size in storage command formatting
evaccaro Oct 19, 2026
21bc7ed
Restore original trailing blank line
evaccaro Oct 19, 2026
e0f945f
Check storage command capacity before copying key data
evaccaro Oct 19, 2026
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
28 changes: 28 additions & 0 deletions test/unit/memcached_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,34 @@ def test_key_too_long
end
end

def test_storage_command_with_oversized_prefix_and_key
cache = Memcached.new @servers, @options.merge(:prefix_key => "p" * 127)
key = "k" * 250

assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
cache.set key, @value
end
assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
cache.prepend key, "value"
end
end

def test_storage_command_with_prefix_and_key_filling_buffer
cache = Memcached.new @servers, @options.merge(:prefix_key => "p" * 127)

assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
cache.set "k" * 218, @value
end
end

def test_noreply_delete_with_oversized_prefix_and_key
cache = Memcached.new @servers, @noblock_options.merge(:prefix_key => "p" * 127)

assert_raises(Memcached::ABadKeyWasProvidedOrCharactersOutOfRange) do
cache.delete "k" * 250
end
end

def test_verify_key_disabled
cache = Memcached.new @servers, :verify_key => false
key = "i have a space"
Expand Down
7 changes: 5 additions & 2 deletions vendor/libmemcached-0.32/libmemcached/memcached_storage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ static inline memcached_return memcached_send(memcached_st *ptr,
char *buffer_ptr= buffer;
const char *command= storage_op_string(verb);

if (strlen(command) + strlen(ptr->prefix_key) + key_length + 1 >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_BAD_KEY_PROVIDED;

/* Copy in the command, no space needed, we handle that in the command function*/
memcpy(buffer_ptr, command, strlen(command));

Expand All @@ -123,9 +126,9 @@ static inline memcached_return memcached_send(memcached_st *ptr,

if (verb == DELETE_OP) {
if (ptr->flags & MEM_NOREPLY)
write_length+= (size_t) snprintf(buffer_ptr, MEMCACHED_DEFAULT_COMMAND_SIZE, "noreply");
write_length+= (size_t) snprintf(buffer_ptr, MEMCACHED_DEFAULT_COMMAND_SIZE - write_length, "noreply");
} else {
write_length+= (size_t) snprintf(buffer_ptr, MEMCACHED_DEFAULT_COMMAND_SIZE,
write_length+= (size_t) snprintf(buffer_ptr, MEMCACHED_DEFAULT_COMMAND_SIZE - write_length,
"%u %llu %zu%s\r\n",
flags,
(unsigned long long)expiration, value_length,
Expand Down
Loading