diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:46:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-27 17:46:20 +0100 |
| commit | effed09bd7d8081704eaa017060da84c32e3bf29 (patch) | |
| tree | 9dd712312526cdbac1ab622efcdfc28e3fce965a /sql/field.cc | |
| parent | 7189f09aa6d434fc889cb6d819e97c09f8cc0bcf (diff) | |
| parent | 12e60c4989ce0214da88faad7c08d2f046885327 (diff) | |
| download | mariadb-git-effed09bd7d8081704eaa017060da84c32e3bf29.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 42d71477372..480d36c2e28 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7524,7 +7524,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs) goto err; // Check given WKB uint32 wkb_type; - if (length < SRID_SIZE + WKB_HEADER_SIZE + SIZEOF_STORED_DOUBLE*2) + if (length < SRID_SIZE + WKB_HEADER_SIZE + 4) goto err; wkb_type= uint4korr(from + SRID_SIZE + 1); if (wkb_type < (uint32) Geometry::wkb_point || |