projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bad memory reference that could occur if empty key block was to
[idzebra-moved-to-github.git]
/
index
/
retrieve.c
diff --git
a/index/retrieve.c
b/index/retrieve.c
index
d2f5398
..
2627998
100644
(file)
--- a/
index/retrieve.c
+++ b/
index/retrieve.c
@@
-1,4
+1,4
@@
-/* $Id: retrieve.c,v 1.66 2007-03-06 12:40:18 adam Exp $
+/* $Id: retrieve.c,v 1.67 2007-03-19 21:50:39 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-208,7
+208,7
@@
int zebra_special_sort_fetch(ZebraHandle zh, zint sysno, ODR odr,
*rec_lenp = wrbuf_len(wrbuf);
*rec_bufp = odr_malloc(odr, *rec_lenp);
memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
*rec_lenp = wrbuf_len(wrbuf);
*rec_bufp = odr_malloc(odr, *rec_lenp);
memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
return 0;
}
}
return 0;
}
}
@@
-359,7
+359,7
@@
int zebra_special_index_fetch(ZebraHandle zh, zint sysno, ODR odr,
*rec_lenp = wrbuf_len(wrbuf);
*rec_bufp = odr_malloc(odr, *rec_lenp);
memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
*rec_lenp = wrbuf_len(wrbuf);
*rec_bufp = odr_malloc(odr, *rec_lenp);
memcpy(*rec_bufp, wrbuf_buf(wrbuf), *rec_lenp);
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
}
zebra_rec_keys_close(keys);
return ret_code;
}
zebra_rec_keys_close(keys);
return ret_code;
@@
-428,10
+428,10
@@
int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
}
*rec_lenp = wrbuf_len(wrbuf);
if (*rec_lenp)
}
*rec_lenp = wrbuf_len(wrbuf);
if (*rec_lenp)
- *rec_bufp = odr_strdup(odr, wrbuf_buf(wrbuf));
+ *rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf));
else
ret = YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST;
else
ret = YAZ_BIB1_NO_SYNTAXES_AVAILABLE_FOR_THIS_REQUEST;
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
return ret;
}
return ret;
}
@@
-527,11
+527,11
@@
int zebra_special_fetch(ZebraHandle zh, zint sysno, int score, ODR odr,
}
*rec_lenp = wrbuf_len(wrbuf);
if (*rec_lenp)
}
*rec_lenp = wrbuf_len(wrbuf);
if (*rec_lenp)
- *rec_bufp = odr_strdup(odr, wrbuf_buf(wrbuf));
+ *rec_bufp = odr_strdup(odr, wrbuf_cstr(wrbuf));
else
ret = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
else
ret = YAZ_BIB1_SYSTEM_ERROR_IN_PRESENTING_RECORDS;
- wrbuf_free(wrbuf, 1);
+ wrbuf_destroy(wrbuf);
rec_free(&rec);
return ret;
}
rec_free(&rec);
return ret;
}