Quiet more sanitization errors.

kohler · Oct 3, 2018 · 41b0845 · 41b0845
1 parent 46605cc
commit 41b0845
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/include/click/array_memory.hh b/include/click/array_memory.hh
@@ -24,13 +24,16 @@ template <size_t s> class sized_array_memory { public:
 	memcpy(a, x, s);
     }
     static void copy(void *dst, const void *src, size_t n) {
-	memcpy(dst, src, n * s);
+        if (n)
+            memcpy(dst, src, n * s);
     }
     static void move(void *dst, const void *src, size_t n) {
-	memmove(dst, src, n * s);
+        if (n)
+            memmove(dst, src, n * s);
     }
     static void move_onto(void *dst, const void *src, size_t n) {
-	memmove(dst, src, n * s);
+        if (n)
+            memmove(dst, src, n * s);
     }
     static void destroy(void *a, size_t n) {
 	(void) a, (void) n;

diff --git a/lib/router.cc b/lib/router.cc
@@ -1504,7 +1504,8 @@ Router::store_local_handler(int eindex, Handler &to_store)
             for (int i = 0; i < HANDLER_BUFSIZ - 1; i++)
                 new_handler_buf[i]._next_by_name = _nhandlers_bufs + i + 1;
             _free_handler = _nhandlers_bufs;
-            memcpy(new_handler_bufs, _handler_bufs, sizeof(Handler*) * n_handler_bufs);
+            if (n_handler_bufs)
+                memcpy(new_handler_bufs, _handler_bufs, sizeof(Handler*) * n_handler_bufs);
             new_handler_bufs[n_handler_bufs] = new_handler_buf;
             delete[] _handler_bufs;
             _handler_bufs = new_handler_bufs;