diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-16 13:04:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-16 13:04:42 +0200 |
| commit | ee9afef27141f55165009fdbd58e54942f3a6867 (patch) | |
| tree | b5e15e62e10daa40aef3e6d33eeabf9205d1be0f /sql/spatial.cc | |
| parent | d9a8799205d160688f81362356dd2323eb8a91ea (diff) | |
| parent | a619bfad30c13207fb0453a85af5740846186900 (diff) | |
| download | mariadb-git-ee9afef27141f55165009fdbd58e54942f3a6867.tar.gz | |
mysql-5.5.28
Diffstat (limited to 'sql/spatial.cc')
| -rw-r--r-- | sql/spatial.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/spatial.cc b/sql/spatial.cc index e82eec26fdb..de0b563eaf4 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -601,7 +601,8 @@ uint Gis_line_string::init_from_wkb(const char *wkb, uint len, Gis_point p; if (len < 4 || - (n_points= wkb_get_uint(wkb, bo))<1) + (n_points= wkb_get_uint(wkb, bo)) < 1 || + n_points > max_n_points) return 0; proper_length= 4 + n_points * POINT_DATA_SIZE; @@ -1334,9 +1335,9 @@ uint Gis_multi_point::init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, Gis_point p; const char *wkb_end; - if (len < 4) + if (len < 4 || + (n_points= wkb_get_uint(wkb, bo)) > max_n_points) return 0; - n_points= wkb_get_uint(wkb, bo); proper_size= 4 + n_points * (WKB_HEADER_SIZE + POINT_DATA_SIZE); if (len < proper_size || res->reserve(proper_size)) |