MonetDB: Oct2010 - Only redirect if pointer is within bounds.

[Sjoerd Mullender]

Changeset: 92879160c8ab for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92879160c8ab
Modified Files:
        MonetDB5/src/modules/mal/pqueue.mx
Branch: Oct2010
Log Message:

Only redirect if pointer is within bounds.
Found by valgrind.


diffs (25 lines):

diff -r ceb9f565b30f -r 92879160c8ab MonetDB5/src/modules/mal/pqueue.mx
--- a/MonetDB5/src/modules/mal/pqueue.mx        Wed Oct 13 09:58:12 2010 +0200
+++ b/MonetDB5/src/modules/mal/pqueue.mx        Wed Oct 13 09:58:59 2010 +0200
@@ -947,8 +947,8 @@
                  n = (BUN) *N;
        bn = BATnew(TYPE_oid, TYPE_oid, n);
        for(i=0; i<n; ) {
-               oid *v = (oid*)Tloc(a,i), ov = *v; 
-               for( j=i; *v == ov; j++, v = (oid*)Tloc(a,j))
+               oid ov = * (oid *) Tloc(a, i);
+               for (j = i; j < n && * (oid *) Tloc(a, j) == ov; j++)
                        ;
                if (j == i+1) {
                        BUNins(bn, Hloc(a,i), &ov, FALSE);
@@ -990,8 +990,8 @@
                  n = (BUN) *N;
        bn = BATnew(TYPE_oid, TYPE_oid, n);
        for(i=0; i<n; ) {
-               oid *v = (oid*)Tloc(a,i), ov = *v; 
-               for( j=i; *v == ov; j++, v = (oid*)Tloc(a,j))
+               oid ov = * (oid *) Tloc(a, i);
+               for (j = i; j < n && * (oid *) Tloc(a, j) == ov; j++)
                        ;
                if (j == i+1) {
                        BUNins(bn, Hloc(a,i), &ov, FALSE);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list