mtrie: Do not throw exception on allocation failure

692648de · Martin Hurton · e471e5b4 · 692648de
Commit 692648de authored Jul 02, 2012 by Martin Hurton
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

mtrie.cpp src/mtrie.cpp +4 -2

No files found.
--- a/src/mtrie.cpp
+++ b/src/mtrie.cpp
@@ -72,8 +72,10 @@ bool zmq::mtrie_t::add_helper (unsigned char *prefix_, size_t size_,
    //  We are at the node corresponding to the prefix. We are done.
    if (!size_) {
        bool result = !pipes;
-        if (!pipes)
+        if (!pipes) {
-            pipes = new pipes_t;
+            pipes = new (std::nothrow) pipes_t;
+            alloc_assert (pipes);
+        }
        pipes->insert (pipe_);
        return result;
    }