Fixed leak en MTF

diff --git a/src/blocksorting/bs.c b/src/blocksorting/bs.c
index 93b7bb55c5395bdc082f5ba939c97d988b0938c3..a1e14a252cb3e476088a2633e704da95c5d4fc80 100644 (file)
--- a/src/blocksorting/bs.c
+++ b/src/blocksorting/bs.c
@@ -1,6 +1,7 @@
 
 #include "bs.h"
 #include <stdlib.h>
 
 #include "bs.h"
 #include <stdlib.h>

+#include <ctype.h>

 
 /* Block Sorting Optimizado en memoria! */
 
 
 /* Block Sorting Optimizado en memoria! */
 


@@ -140,12 +141,48 @@ void bs_destroy(t_BlockSort *bs)
        free(bs);
 }
 
        free(bs);
 }
 

+
+void bs_EOL(char *data, Uint32 pagesize, Uint32 *j)
+{
+       /* Trato de agregar 4 espacios antes y 4 despues de un \n */
+       int i = (*j);
+
+       /* Verifico poder hacerlo */
+       if ((i+9) >= pagesize) return; /* No pude! */
+       
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+       data[i++] = ' ';
+
+       (*j) += 9;
+}
+

 int bs_readblock(FILE *fp, char *data, Uint32 pagesize)
 {
        Uint32 i=0;
 int bs_readblock(FILE *fp, char *data, Uint32 pagesize)
 {
        Uint32 i=0;

-
+       char c;

        while ((!feof(fp)) && (i < pagesize)) {
        while ((!feof(fp)) && (i < pagesize)) {

-               data[i++] = fgetc(fp);
+               c = fgetc(fp);
+/*             if (c != '\n')*/
+               if (c == '\0') {
+                       /* Debo encodear el \0 para que no complique */
+                       data[i++] = 0x00;
+                       data[i++] = 0xFF;
+               }
+               if (isupper(c)) {
+                       data[i++] = '\0';
+                       data[i++] = tolower(c);
+               } else {
+                       data[i++] = c;
+               }
+/*             else
+                       bs_EOL(data, pagesize, &i);*/

        }
 
        /* Saco un EOF que lee de mas */
        }
 
        /* Saco un EOF que lee de mas */

diff --git a/src/mtf/mtf.c b/src/mtf/mtf.c
index b59f128e14a181aff0eab819c5f97b255741a1b8..5bf5b39ce0f28cfab8eaafa829be4619508aee2a 100644 (file)
--- a/src/mtf/mtf.c
+++ b/src/mtf/mtf.c
@@ -32,6 +32,7 @@ unsigned char *jacu_mtf(unsigned char *datos, int len, unsigned char **_z, int *
                        pop_front(z, pos[i]);
        }
        (*z_len) = size;
                        pop_front(z, pos[i]);
        }
        (*z_len) = size;

+       free(z);

        return pos;
 }
 
        return pos;
 }