zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-19 17:06:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: Fix another buffer overflow compiler warning.

Browse source
This commit is contained in:
Alexandre Julliard 2023-03-01 11:20:15 +01:00
parent d5468b9cac
commit 14967933ec
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
server/mapping.c
View file

@ -1192,7 +1192,6 @@ DECL_HANDLER(map_view)
{
struct mapping *mapping = NULL;
struct memory_view *view;
data_size_t namelen = 0;
if (!req->size || (req->base & page_mask) || req->base + req->size < req->base) /* overflow */
{
@ -1211,6 +1210,8 @@ DECL_HANDLER(map_view)
if (!req->mapping) /* image mapping for a .so dll */
{
data_size_t namelen = 0;
if (get_req_data_size() > sizeof(view->image)) namelen = get_req_data_size() - sizeof(view->image);
if (!(view = mem_alloc( sizeof(struct memory_view) + namelen * sizeof(WCHAR) ))) return;
memset( view, 0, sizeof(*view) );
@ -1243,13 +1244,13 @@ DECL_HANDLER(map_view)
goto done;
}
if ((view = mem_alloc( offsetof( struct memory_view, name[namelen] ))))
if ((view = mem_alloc( sizeof(*view) )))
{
view->base = req->base;
view->size = req->size;
view->start = req->start;
view->flags = mapping->flags;
view->namelen = namelen;
view->namelen = 0;
view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL;
view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL;
view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL;