Merge pull request #30 from hintjens/master

Cherry picking fixes from libzmq

.gitignore

@@ -70,6 +70,15 @@ tests/test_linger
 tests/test_security_null
 tests/test_security_plain
 tests/test_abstract_ipc
+tests/test_connect_delay_tipc
+tests/test_pair_tipc
+tests/test_reqrep_device_tipc
+tests/test_reqrep_tipc
+tests/test_router_handover
+tests/test_router_mandatory_tipc
+tests/test_shutdown_stress_tipc
+tests/test_sub_forward_tipc
+tests/test_term_endpoint_tipc
 tests/test*.log
 tests/test*.trs
 src/platform.hpp*

NEWS

@@ -4,9 +4,13 @@
 Bug Fixes
 ---------
 
+* Fixed LIBZMQ-578 - z85_decode was extremely slow
+
 * Fixed LIBZMQ-569 - Socket server crashes with random client data
+
 * Fixed LIBZMQ-571 - test_stream failing in some cases
-* Pulled expected failing test_linger.cpp from release.
+
+* Pulled expected failing test_linger.cpp from release
 
 
 0MQ version 4.0.1 stable, released on 2013/10/08

doc/zmq_msg_get.txt

@@ -40,6 +40,7 @@ EXAMPLE
 -------
 .Receiving a multi-frame message
 ----
+zmq_msg_t frame;
 while (true) {
     //  Create an empty 0MQ message to hold the message frame
     int rc = zmq_msg_init (&frame);
@@ -53,7 +54,7 @@ while (true) {
         fprintf (stderr, "end\n");
         break;
     }
-    zmq_msg_close (frame);
+    zmq_msg_close (&frame);
 }
 ----
 

doc/zmq_msg_more.txt

@@ -45,7 +45,7 @@ while (true) {
         fprintf (stderr, "end\n");
         break;
     }
-    zmq_msg_close (part);
+    zmq_msg_close (&part);
 }
 ----
 

src/zmq_utils.cpp

@@ -142,15 +142,15 @@ char *zmq_z85_encode (char *dest, uint8_t *data, size_t size)
 
 uint8_t *zmq_z85_decode (uint8_t *dest, char *string)
 {
-    
     if (strlen (string) % 5 != 0) {
         errno = EINVAL;
         return NULL;
     }
     unsigned int byte_nbr = 0;
     unsigned int char_nbr = 0;
+    unsigned int string_len = strlen (string);
     uint32_t value = 0;
-    while (char_nbr < strlen (string)) {
+    while (char_nbr < string_len) {
         //  Accumulate value in base 85
         value = value * 85 + decoder [(uint8_t) string [char_nbr++] - 32];
         if (char_nbr % 5 == 0) {
@@ -185,8 +185,9 @@ int zmq_curve_keypair (char* z85_public_key, char *z85_secret_key)
     uint8_t secret_key [32];
 
     int rc = crypto_box_keypair (public_key, secret_key);
-    // is there a sensible errno to set here?
-    if (rc) return rc;
+    //  Is there a sensible errno to set here?
+    if (rc)
+        return rc;
     
     zmq_z85_encode (z85_public_key, public_key, 32);
     zmq_z85_encode (z85_secret_key, secret_key, 32);