Attachment 596217 Details for Bug 837626 – fix code that is fairly obviously wrond on x86_64

[patch] fix code that is fairly obviously wrond on x86_64

corruption.patch (text/plain), 1.34 KB, created by Paul Bolle on 2012-07-04 12:55:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Bolle

Created: 2012-07-04 12:55:48 UTC

Size: 1.34 KB

patch

obsolete

>diff -up src/invlib.c.peb src/invlib.c
>--- src/invlib.c.peb	2012-03-12 18:57:55.000000000 +0100
>+++ src/invlib.c	2012-07-04 01:39:29.868400313 +0200
>@@ -169,8 +169,8 @@ invmake(char *invname, char *invpost, FI
> 	numpost = 1;
> 
> 	/* set up as though a block had come and gone, i.e., set up for new block  */
>-	/* FIXME HBB: magic number alert (16) */
>-	amtused = 16; /* leave no space - init 3 words + one for luck */
>+	/* 3 longs needed for: numinvitems, next block, and previous block */
>+	amtused = 3 * sizeof(long);
> 	numinvitems = 0;
> 	numlogblk = 0;
> 	lastinblk = sizeof(t_logicalblk);
>@@ -371,8 +371,10 @@ invnewterm(void)
> 	zipf[0]++;
> #endif
>     len = strlen(thisterm);
>+    /* length of term rounded up to long boundary */
>     wdlen = (len + (sizeof(long) - 1)) / sizeof(long);
>-    /* HBB FIXME 20060419: magic number: 3 */
>+    /* each term needs 2 longs for its iteminfo and
>+     * 1 long for its offset */
>     numwilluse = (wdlen + 3) * sizeof(long);
>     /* new block if at least 1 item in block */
>     if (numinvitems && numwilluse + amtused > sizeof(t_logicalblk)) {
>@@ -435,7 +437,8 @@ invnewterm(void)
> 	    invcannotwrite(indexfile);
> 	    return(0);
> 	}
>-	amtused = 16;
>+	/* 3 longs needed for: numinvitems, next block, and previous block */
>+	amtused = 3 * sizeof(long);
> 	numlogblk++;
> 	/* check if had to back up, if so do it */
> 	if (backupflag) {

Actions: View | Diff

Attachments on bug 837626: 596212 | 596217 | 596219