bugfix issue cloudwu#49

dglyoo · Apr 3, 2016 · 69692b5 · 69692b5
1 parent daee37b
commit 69692b5
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/sproto.c b/sproto.c
@@ -1003,19 +1003,18 @@ decode_array(sproto_callback cb, struct sproto_arg *args, uint8_t * stream) {
 	uint32_t sz = todword(stream);
 	int type = args->type;
 	int i;
+	if (sz == 0) {
+		// It's empty array, call cb with index == -1 to create the empty array.
+		args->index = -1;
+		args->value = NULL;
+		args->length = 0;
+		cb(args);
+		return 0;
+	}	
 	stream += SIZEOF_LENGTH;
 	switch (type) {
 	case SPROTO_TINTEGER: {
-		int len;
-		if (sz < 1) {
-			// It's empty integer array, call cb with index == -1 to create the empty array.
-			args->index = -1;
-			args->value = NULL;
-			args->length = 0;
-			cb(args);
-			return 0;
-		}
-		len = *stream;
+		int len = *stream;
 		++stream;
 		--sz;
 		if (len == sizeof(uint32_t)) {