X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frecindex.c;h=81e390bce12fdb7352f1ce59d0d4d535c8dc062c;hb=43506dd0ff92373604bb7288e2dcc943b2c1d524;hp=0244da9c526c4796cfcc00ec339a5b9d1ab23100;hpb=f3425fb457792aae865096cf9acf5cb41798b1d1;p=idzebra-moved-to-github.git

diff --git a/index/recindex.c b/index/recindex.c
index 0244da9..81e390b 100644
--- a/index/recindex.c
+++ b/index/recindex.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: recindex.c,v $
- * Revision 1.25  1999-07-06 12:28:04  adam
+ * Revision 1.27  1999-10-29 10:02:33  adam
+ * Fixed decompression buffer overflow.
+ *
+ * Revision 1.26  1999/07/06 13:34:57  adam
+ * Fixed bug (introduced by previous commit).
+ *
+ * Revision 1.25  1999/07/06 12:28:04  adam
  * Updated record index structure. Format includes version ID. Compression
  * algorithm ID is stored for each record block.
  *
@@ -419,6 +425,7 @@ static void rec_decode_unsigned(unsigned *np, unsigned char *buf, int *len)
     (*len)++;
     *np = n;
 }
+
 static void rec_cache_flush_block1 (Records p, Record rec, Record last_rec,
 				    char **out_buf, int *out_size,
 				    int *out_offset)
@@ -505,8 +512,8 @@ static void rec_write_multiple (Records p, int saveCount)
 	default:
 	    break;
         }
-        rec_rm (&e->rec);
     }
+
     *sysnop = -1;
     if (ref_count)
     {
@@ -562,6 +569,13 @@ static void rec_cache_flush (Records p, int saveCount)
         saveCount = 0;
 
     rec_write_multiple (p, saveCount);
+
+    for (i = 0; i<p->cache_cur - saveCount; i++)
+    {
+        struct record_cache_entry *e = p->record_cache + i;
+        rec_rm (&e->rec);
+    } 
+    /* i still being used ... */
     for (j = 0; j<saveCount; j++, i++)
         memcpy (p->record_cache+j, p->record_cache+i,
                 sizeof(*p->record_cache));
@@ -641,7 +655,7 @@ void rec_close (Records *pp)
 
 Record rec_get (Records p, int sysno)
 {
-    int i, in_size;
+    int i, in_size, r;
     Record rec, *recp;
     struct record_index_entry entry;
     int freeblock, dst_type;
@@ -657,7 +671,7 @@ Record rec_get (Records p, int sysno)
     if ((recp = rec_cache_lookup (p, sysno, recordFlagNop)))
         return rec_cp (*recp);
 
-    if (!read_indx (p, sysno, &entry, sizeof(entry), 1))
+    if (read_indx (p, sysno, &entry, sizeof(entry), 1) < 1)
         return NULL;       /* record is not there! */
 
     if (!entry.size)
@@ -669,11 +683,12 @@ Record rec_get (Records p, int sysno)
 
     assert (freeblock > 0);
     
-    rec = (Record) xmalloc (sizeof(*rec));
     rec_tmp_expand (p, entry.size);
 
     cptr = p->tmp_buf;
-    bf_read (p->data_BFile[dst_type], freeblock, 0, 0, cptr);
+    r = bf_read (p->data_BFile[dst_type], freeblock, 0, 0, cptr);
+    if (r < 0)
+	return 0;
     memcpy (&freeblock, cptr, sizeof(freeblock));
 
     while (freeblock)
@@ -683,11 +698,14 @@ Record rec_get (Records p, int sysno)
         cptr += p->head.block_size[dst_type] - sizeof(freeblock);
         
         memcpy (&tmp, cptr, sizeof(tmp));
-        bf_read (p->data_BFile[dst_type], freeblock, 0, 0, cptr);
+        r = bf_read (p->data_BFile[dst_type], freeblock, 0, 0, cptr);
+	if (r < 0)
+	    return 0;
         memcpy (&freeblock, cptr, sizeof(freeblock));
         memcpy (cptr, &tmp, sizeof(tmp));
     }
 
+    rec = (Record) xmalloc (sizeof(*rec));
     rec->sysno = sysno;
     memcpy (&compression_method, p->tmp_buf + sizeof(int) + sizeof(short),
 	    sizeof(compression_method));
@@ -697,14 +715,17 @@ Record rec_get (Records p, int sysno)
     {
     case REC_COMPRESS_BZIP2:
 #if HAVE_BZLIB_H
-	bz_size = entry.size * 30+100;
-	bz_buf = (char *) xmalloc (bz_size);
-	i = bzBuffToBuffDecompress (bz_buf, &bz_size, in_buf, in_size, 0, 0);
-	logf (LOG_LOG, "decompress %5d %5d", in_size, bz_size);
-	if (i != BZ_OK)
+	bz_size = entry.size * 20 + 100;
+	while (1)
 	{
-	    logf (LOG_FATAL, "bzBuffToBuffDecompress error code=%d", i);
-	    exit (1);
+	    bz_buf = (char *) xmalloc (bz_size);
+	    i = bzBuffToBuffDecompress (bz_buf, &bz_size, in_buf, in_size, 0, 0);
+	    logf (LOG_LOG, "decompress %5d %5d", in_size, bz_size);
+	    if (i == BZ_OK)
+		break;
+	    logf (LOG_LOG, "failed");
+	    xfree (bz_buf);
+            bz_size *= 2;
 	}
 	in_buf = bz_buf;
 	in_size = bz_size;