Commit f16b8a19 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

ndb - bug#34160 

  make sure release of not added ptr does not corrupt hashtable
parent 4230b1b5

ndb/src/kernel/vm/DLHashTable.hpp

+18 −4
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ public: 
  /**

   * Seize element from pool - return i

   *

   * Note must be either added using <b>add</b> or released 

   * using <b>release</b>

   * Note *must* be added using <b>add</b> (even before hash.release)

   *             or be released using pool

   */

  bool seize(Ptr<T> &);
@@ -374,8 +374,15 @@ DLHashTable<T>::remove(Ptr<T> & ptr){ 
    prevP->nextHash = next;

  } else {

    const Uint32 hv = ptr.p->hashValue() & mask;  

    if (hashValues[hv] == ptr.i)

    {

      hashValues[hv] = next;

    }

    else

    {

      // Will add assert in 5.1

    }

  }

  

  if(next != RNIL){

    T * nextP = thePool.getPtr(next);
@@ -395,8 +402,15 @@ DLHashTable<T>::release(Ptr<T> & ptr){ 
    prevP->nextHash = next;

  } else {

    const Uint32 hv = ptr.p->hashValue() & mask;  

    if (hashValues[hv] == ptr.i)

    {

      hashValues[hv] = next;

    }

    else

    {

      // Will add assert in 5.1

    }

  }

  

  if(next != RNIL){

    T * nextP = thePool.getPtr(next);

ndb/src/kernel/vm/DLHashTable2.hpp

+18 −4
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ public: 
  /**

   * Seize element from pool - return i

   *

   * Note must be either added using <b>add</b> or released 

   * using <b>release</b>

   * Note *must* be added using <b>add</b> (even before hash.release)

   *             or be released using pool

   */

  bool seize(Ptr<T> &);
@@ -375,8 +375,15 @@ DLHashTable2<T, U>::remove(Ptr<T> & ptr){ 
    prevP->nextHash = next;

  } else {

    const Uint32 hv = ptr.p->hashValue() & mask;  

    if (hashValues[hv] == ptr.i)

    {

      hashValues[hv] = next;

    }

    else

    {

      // Will add assert in 5.1

    }

  }

  

  if(next != RNIL){

    T * nextP = (T*)thePool.getPtr(next);       // cast
@@ -396,8 +403,15 @@ DLHashTable2<T, U>::release(Ptr<T> & ptr){ 
    prevP->nextHash = next;

  } else {

    const Uint32 hv = ptr.p->hashValue() & mask;  

    if (hashValues[hv] == ptr.i)

    {

      hashValues[hv] = next;

    }

    else

    {

      // Will add assert in 5.1

    }

  }

  

  if(next != RNIL){

    T * nextP = (T*)thePool.getPtr(next);       // cast