ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

noux: fix leak in pipe ring buffer

Browse Source 
Fixes #1923
This commit is contained in:
Emery Hemingway 2016-03-28 11:41:39 +02:00 committed by Christian Helmuth
parent 14f1ac497e
commit b07be42e9f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
repos/ports/src/noux/pipe_io_channel.h
View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (C) 2012-2013 Genode Labs GmbH
* Copyright (C) 2012-2016 Genode Labs GmbH
*
* This file is part of the Genode OS framework, which is distributed
* under the terms of the GNU General Public License version 2.
@ -133,9 +133,12 @@ namespace Noux {
memcpy(dst, &_buffer[_read_offset], upper_len);
size_t const lower_len = min(dst_len - upper_len, _write_offset);
memcpy(dst + upper_len, &_buffer[0], lower_len);
_read_offset = lower_len;
if (lower_len) {
memcpy(dst + upper_len, &_buffer[0], lower_len);
_read_offset = lower_len;
} else {
_read_offset += upper_len;
}
_wake_up_writer();
return upper_len + lower_len;