From c03b382d613afed1954d66c472fa7384ff0ca316 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Thu, 20 Apr 2023 20:58:19 +0200
Subject: [PATCH] src: some more "noexcept"

---
 src/conf.h             |  4 ++--
 src/util/membuffer.cpp | 10 +++++-----
 src/util/membuffer.h   |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/conf.h b/src/conf.h
index b4360508..dd4f0c0a 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -774,8 +774,8 @@ class Throwable;
 
 // util/membuffer.h
 class MemBuffer;
-void *membuffer_get_void_ptr(MemBuffer &mb);
-unsigned membuffer_get_size(MemBuffer &mb);
+void *membuffer_get_void_ptr(MemBuffer &mb) noexcept;
+unsigned membuffer_get_size(MemBuffer &mb) noexcept;
 
 // util/dt_check.cpp
 void upx_compiler_sanity_check();
diff --git a/src/util/membuffer.cpp b/src/util/membuffer.cpp
index 933d0616..1da7ca5e 100644
--- a/src/util/membuffer.cpp
+++ b/src/util/membuffer.cpp
@@ -29,8 +29,8 @@
 #include "membuffer.h"
 
 // extra functions to reduce dependency on membuffer.h
-void *membuffer_get_void_ptr(MemBuffer &mb) { return mb.getVoidPtr(); }
-unsigned membuffer_get_size(MemBuffer &mb) { return mb.getSize(); }
+void *membuffer_get_void_ptr(MemBuffer &mb) noexcept { return mb.getVoidPtr(); }
+unsigned membuffer_get_size(MemBuffer &mb) noexcept { return mb.getSize(); }
 
 /*static*/ MemBuffer::Stats MemBuffer::stats;
 
@@ -45,7 +45,7 @@ unsigned membuffer_get_size(MemBuffer &mb) { return mb.getSize(); }
 **************************************************************************/
 
 #if defined(__SANITIZE_ADDRESS__)
-static forceinline constexpr bool use_simple_mcheck() { return false; }
+static forceinline constexpr bool use_simple_mcheck() noexcept { return false; }
 #elif (WITH_VALGRIND) && defined(RUNNING_ON_VALGRIND)
 static bool use_simple_mcheck_flag;
 static noinline void init_use_simple_mcheck() noexcept {
@@ -56,13 +56,13 @@ static noinline void init_use_simple_mcheck() noexcept {
     }
     use_simple_mcheck_flag = r;
 }
-static bool use_simple_mcheck() {
+static bool use_simple_mcheck() noexcept {
     static upx_std_once_flag init_done;
     upx_std_call_once(init_done, init_use_simple_mcheck);
     return use_simple_mcheck_flag;
 }
 #else
-static forceinline constexpr bool use_simple_mcheck() { return true; }
+static forceinline constexpr bool use_simple_mcheck() noexcept { return true; }
 #endif
 
 /*************************************************************************
diff --git a/src/util/membuffer.h b/src/util/membuffer.h
index da2e6f29..895b9bba 100644
--- a/src/util/membuffer.h
+++ b/src/util/membuffer.h
@@ -96,11 +96,11 @@ public:
 
     void dealloc() noexcept;
     void checkState() const;
-    unsigned getSize() const { return size_in_bytes; }
+    unsigned getSize() const noexcept { return size_in_bytes; }
 
     // explicit conversion
-    void *getVoidPtr() { return (void *) ptr; }
-    const void *getVoidPtr() const { return (const void *) ptr; }
+    void *getVoidPtr() noexcept { return (void *) ptr; }
+    const void *getVoidPtr() const noexcept { return (const void *) ptr; }
 
     // util
     void fill(unsigned off, unsigned len, int value);