morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[warnings] integer casts/checks

Browse Source
This commit is contained in:
akallabeth
2024-07-02 12:22:14 +02:00
parent d6949721c6
commit 4099bd4e45
6 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
uwac/libuwac/uwac-clipboard.c
View File

@@ -230,7 +230,7 @@ void* UwacClipboardDataGet(UwacSeat* seat, const char* mime, size_t* size)
size_t alloc = 0;
size_t pos = 0;
char* data = NULL;
int pipefd[2];
int pipefd[2] = { 0 };
if (!seat || !mime || !size || !seat->offer)
return NULL;
@@ -250,26 +250,21 @@ void* UwacClipboardDataGet(UwacSeat* seat, const char* mime, size_t* size)
alloc += 1024;
tmp = xrealloc(data, alloc);
if (!tmp)
{
free(data);
close(pipefd[0]);
return NULL;
}
goto fail;
data = tmp;
if (pos > alloc)
goto fail;
r = read(pipefd[0], &data[pos], alloc - pos);
if (r > 0)
pos += r;
if (r < 0)
{
free(data);
close(pipefd[0]);
return NULL;
}
goto fail;
} while (r > 0);
close(pipefd[0]);
close(pipefd[1]);
if (alloc > 0)
{
@@ -277,4 +272,9 @@ void* UwacClipboardDataGet(UwacSeat* seat, const char* mime, size_t* size)
*size = pos + 1;
}
return data;
fail:
free(data);
close(pipefd[0]);
return NULL;
}

24
uwac/libuwac/uwac-window.c
View File

@@ -78,8 +78,8 @@ static void UwacWindowDestroyBuffers(UwacWindow* w)
w->buffers = NULL;
}
static int UwacWindowShmAllocBuffers(UwacWindow* w, int nbuffers, int allocSize, uint32_t width,
uint32_t height, enum wl_shm_format format);
static int UwacWindowShmAllocBuffers(UwacWindow* w, int64_t nbuffers, int64_t allocSize,
uint32_t width, uint32_t height, enum wl_shm_format format);
static void xdg_handle_toplevel_configure(void* data, struct xdg_toplevel* xdg_toplevel,
int32_t width, int32_t height, struct wl_array* states)
@@ -316,22 +316,28 @@ static void shell_popup_done(void* data, struct wl_shell_surface* surface)
static const struct wl_shell_surface_listener shell_listener = { shell_ping, shell_configure,
shell_popup_done };
int UwacWindowShmAllocBuffers(UwacWindow* w, int nbuffers, int allocSize, uint32_t width,
int UwacWindowShmAllocBuffers(UwacWindow* w, int64_t nbuffers, int64_t allocSize, uint32_t width,
uint32_t height, enum wl_shm_format format)
{
int ret = UWAC_SUCCESS;
UwacBuffer* newBuffers = NULL;
int fd = 0;
void* data = NULL;
struct wl_shm_pool* pool = NULL;
size_t pagesize = sysconf(_SC_PAGESIZE);
newBuffers = xrealloc(w->buffers, (w->nbuffers + nbuffers) * sizeof(UwacBuffer));
if (!newBuffers)
int64_t pagesize = sysconf(_SC_PAGESIZE);
if (pagesize <= 0)
return UWAC_ERROR_NOMEMORY;
/* round up to a multiple of PAGESIZE to page align data for each buffer */
allocSize = (allocSize + pagesize - 1) & ~(pagesize - 1);
UINT64 test = (0ull + allocSize + pagesize - 1ull) & ~(pagesize - 1);
if (test > INT64_MAX)
return UWAC_ERROR_NOMEMORY;
allocSize = (int64_t)test;
UwacBuffer* newBuffers = xrealloc(w->buffers, (w->nbuffers + nbuffers) * sizeof(UwacBuffer));
if (!newBuffers)
return UWAC_ERROR_NOMEMORY;
w->buffers = newBuffers;
memset(w->buffers + w->nbuffers, 0, sizeof(UwacBuffer) * nbuffers);