← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to storage/maria/ma_unique.c

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-04-17 20:55:22 UTC
  • mfrom: (2.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20140417205522-wof4l36nxhlkn89m
http://bugs.debian.org/745330
* New upstream release, fixing the following security issues:
  * Corresponding MariaDB CVEs for Oracle SPU April 2014 (Closes: #745330)
    - CVE-2014-0384 
    - CVE-2014-2419 
    - CVE-2014-2430 
    - CVE-2014-2431 
    - CVE-2014-2432 
    - CVE-2014-2436 
    - CVE-2014-2438 
    - CVE-2014-2440
* Re-enabled TokuDB with "if arch amd64" in d/rules
* Applied patch to log init output better
  (Closes https://mariadb.atlassian.net/browse/MDEV-5957)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/maria/ma_unique.c
135
135
    else if (keyseg->flag & HA_BLOB_PART)
136
136
    {
137
137
      uint tmp_length= _ma_calc_blob_length(keyseg->bit_start,pos);
138
 
      memcpy(&pos,pos+keyseg->bit_start,sizeof(char*));
 
138
      memcpy((void*) &pos,pos+keyseg->bit_start,sizeof(char*));
139
139
      if (!length || length > tmp_length)
140
140
        length=tmp_length;                      /* The whole blob */
141
141
    }
231
231
        set_if_smaller(a_length, keyseg->length);
232
232
        set_if_smaller(b_length, keyseg->length);
233
233
      }
234
 
      memcpy(&pos_a, pos_a+keyseg->bit_start, sizeof(char*));
235
 
      memcpy(&pos_b, pos_b+keyseg->bit_start, sizeof(char*));
 
234
      memcpy((void*) &pos_a, pos_a+keyseg->bit_start, sizeof(char*));
 
235
      memcpy((void*) &pos_b, pos_b+keyseg->bit_start, sizeof(char*));
236
236
    }
237
237
    if (type == HA_KEYTYPE_TEXT || type == HA_KEYTYPE_VARTEXT1 ||
238
238
        type == HA_KEYTYPE_VARTEXT2)