Changeset: 9805a826a4e6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9805a826a4e6
Modified Files:
gdk/gdk_batop.c
Branch: Oct2014
Log Message:
Off-by-one error.
diffs (21 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -192,7 +192,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
* first that the width of b's offset heap can
* accommodate all values. */
if (b->T->width < SIZEOF_VAR_T &&
- ((size_t) 1 << 8 * b->T->width) < (b->T->width <= 2
? (b->T->vheap->size >> GDK_VARSHIFT) - GDK_VAROFFSET : (b->T->vheap->size >>
GDK_VARSHIFT))) {
+ ((size_t) 1 << 8 * b->T->width) <= (b->T->width <=
2 ? (b->T->vheap->size >> GDK_VARSHIFT) - GDK_VAROFFSET : (b->T->vheap->size >>
GDK_VARSHIFT))) {
/* offsets aren't going to fit, so
* widen offset heap */
if (GDKupgradevarheap(b->T, (var_t)
(b->T->vheap->size >> GDK_VARSHIFT), 0, force) == GDK_FAIL) {
@@ -331,7 +331,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
*(oid *) Hloc(b, BUNlast(b)) = *(oid *)
hp;
v = (var_t) (off >> GDK_VARSHIFT);
if (b->T->width < SIZEOF_VAR_T &&
- ((size_t) 1 << 8 * b->T->width) <
(b->T->width <= 2 ? v - GDK_VAROFFSET : v)) {
+ ((size_t) 1 << 8 * b->T->width) <=
(b->T->width <= 2 ? v - GDK_VAROFFSET : v)) {
/* offset isn't going to fit,
* so widen offset heap */
if (GDKupgradevarheap(b->T, v, 0,
force) == GDK_FAIL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
