Merge branch 'read_bulk_refactor' into develop

michael-grunder · michael-grunder · commit d0f3d01868e8 · 2017-03-26T11:32:33.000-07:00
diff --git a/library.c b/library.c
@@ -463,32 +463,40 @@ redis_sock_read_multibulk_reply_zval(INTERNAL_FUNCTION_PARAMETERS,
 /**
  * redis_sock_read_bulk_reply
  */
-PHP_REDIS_API char *redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_DC)
+PHP_REDIS_API char *
+redis_sock_read_bulk_reply(RedisSock *redis_sock, int bytes TSRMLS_DC)
 {
     int offset = 0;
-    size_t got;
-
     char *reply, c[2];
+    size_t got;
 
     if (-1 == bytes || -1 == redis_check_eof(redis_sock, 0 TSRMLS_CC)) {
         return NULL;
     }
-        reply = emalloc(bytes+1);
 
-        while(offset < bytes) {
-            got = php_stream_read(redis_sock->stream, reply + offset, 
-                bytes-offset);
-            if (got <= 0) {
-                /* Error or EOF */
-                zend_throw_exception(redis_exception_ce, 
-                    "socket error on read socket", 0 TSRMLS_CC);
-                break;
-            }
-            offset += got;
-        }
-	php_stream_read(redis_sock->stream, c, 2);
+    /* Allocate memory for string */
+    reply = emalloc(bytes+1);
+
+    /* Consume bulk string */
+    while(offset < bytes) {
+        got = php_stream_read(redis_sock->stream, reply + offset, bytes-offset);
+        if (got == 0) break;
+        offset += got;
+    }
+
+    /* Protect against reading too few bytes */
+    if (offset < bytes) {
+        /* Error or EOF */
+        zend_throw_exception(redis_exception_ce,
+            "socket error on read socket", 0 TSRMLS_CC);
+        efree(reply);
+        return NULL;
+    }
+
+    /* Consume \r\n and null terminate reply string */
+    php_stream_read(redis_sock->stream, c, 2);
+    reply[bytes] = '\0';
 
-    reply[bytes] = 0;
     return reply;
 }
 
