From 67fd3333e233864eb3bd6d178ab9f4202c9fd3e0 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Tue, 30 Oct 2018 10:42:37 +0100 Subject: [PATCH] base: avoid null pointer reference warning Issue #3022 --- repos/base/include/base/ipc_msgbuf.h | 3 ++- repos/base/src/lib/ldso/include/relocation_generic.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repos/base/include/base/ipc_msgbuf.h b/repos/base/include/base/ipc_msgbuf.h index 459c0100ed..dd8dba142f 100644 --- a/repos/base/include/base/ipc_msgbuf.h +++ b/repos/base/include/base/ipc_msgbuf.h @@ -198,7 +198,8 @@ class Genode::Msgbuf_base : Noncopyable if (_data_size + num_bytes > _capacity) return; /* copy buffer */ - memcpy(_data_last(), src_addr, num_bytes); + if (src_addr && num_bytes) + memcpy(_data_last(), src_addr, num_bytes); /* increment write pointer to next dword-aligned value */ _data_size += align_natural(num_bytes); diff --git a/repos/base/src/lib/ldso/include/relocation_generic.h b/repos/base/src/lib/ldso/include/relocation_generic.h index c119334b61..33d0ca2b43 100644 --- a/repos/base/src/lib/ldso/include/relocation_generic.h +++ b/repos/base/src/lib/ldso/include/relocation_generic.h @@ -170,7 +170,7 @@ class Linker::Reloc_jmpslot_generic } } - Elf::Addr target_addr() const { return *_addr; } + Elf::Addr target_addr() const { return _addr ? *_addr : 0; } };