projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
30d8682
)
Fixed bad memory reference that could occur if empty key block was to
author
Adam Dickmeiss
<adam@indexdata.dk>
Sat, 7 Apr 2007 22:24:12 +0000
(22:24 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Sat, 7 Apr 2007 22:24:12 +0000
(22:24 +0000)
be sorted.
index/key_block.c
patch
|
blob
|
history
diff --git
a/index/key_block.c
b/index/key_block.c
index
9ca9e7d
..
19a3a1a
100644
(file)
--- a/
index/key_block.c
+++ b/
index/key_block.c
@@
-1,4
+1,4
@@
-/* $Id: key_block.c,v 1.9 2007-02-06 09:33:31 adam Exp $
+/* $Id: key_block.c,v 1.10 2007-04-07 22:24:12 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-302,16
+302,21
@@
void key_block_write(zebra_key_block_t p, zint sysno, struct it_key *key_in,
void key_block_flush_int(zebra_key_block_t p,
void key_block_flush_int(zebra_key_block_t p,
- char **key_buf, size_t ptr_top, size_t ptr_i)
+ char **key_buf, size_t ptr_top, size_t ptr_i)
{
FILE *outf;
char out_fname[200];
char *prevcp, *cp;
struct encode_info encode_info;
{
FILE *outf;
char out_fname[200];
char *prevcp, *cp;
struct encode_info encode_info;
+ if (ptr_i == 0)
+ return ;
+
(p->key_file_no)++;
yaz_log(YLOG_DEBUG, "sorting section %d", (p->key_file_no));
(p->key_file_no)++;
yaz_log(YLOG_DEBUG, "sorting section %d", (p->key_file_no));
+ assert(ptr_i > 0);
+
#if USE_SHELLSORT
shellsort(key_buf + ptr_top - ptr_i, ptr_i,
sizeof(char*), key_qsort_compare);
#if USE_SHELLSORT
shellsort(key_buf + ptr_top - ptr_i, ptr_i,
sizeof(char*), key_qsort_compare);