Merge pull request #476 from hurtonm/master

Check decoder's state function for NULL before calling it

Merge pull request #476 from hurtonm/master
Check decoder's state function for NULL before calling it
a28322cd · Pieter Hintjens · 8db8c45b · a8721c3c · a28322cd
Commit a28322cd authored Nov 21, 2012 by Pieter Hintjens
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

decoder.hpp src/decoder.hpp +4 -0

No files found.
--- a/src/decoder.hpp
+++ b/src/decoder.hpp
@@ -148,6 +148,10 @@ namespace zmq
        //  False is returned if the decoder has encountered an error.
        bool stalled ()
        {
+            //  Check whether there was decoding error.
+            if (unlikely (static_cast <T*> (this)->next == NULL))
+                return false;
+
            while (!to_read) {
                if (!(static_cast <T*> (this)->*next) ()) {
                    if (unlikely (!(static_cast <T*> (this)->next)))