undoed all the sds hacking that lead just to random bugs and no memory saving ;)

[redis.git] / sds.c

diff --git a/sds.c b/sds.c
index ca77a079c31900790dce1e1c650a3cfde7ee569a..8e9fd96d9befd2a4b4b7eb7ca9317001df24f8b8 100644 (file)
--- a/sds.c
+++ b/sds.c
@@ -28,6 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define SDS_ABORT_ON_OOM
+
 #include "sds.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -278,8 +280,10 @@ sds *sdssplitlen(char *s, int len, char *sep, int seplen, int *count) {
     for (j = 0; j < (len-(seplen-1)); j++) {
         /* make sure there is room for the next element and the final one */
         if (slots < elements+2) {
+            sds *newtokens;
+
             slots *= 2;
-            sds *newtokens = zrealloc(tokens,sizeof(sds)*slots);
+            newtokens = zrealloc(tokens,sizeof(sds)*slots);
             if (newtokens == NULL) {
 #ifdef SDS_ABORT_ON_OOM
                 sdsOomAbort();