]> granicus.if.org Git - postgis/commitdiff
Allocate enough space for all possible GBOX string outputs (Raúl Marín Rodríguez)
authorPaul Ramsey <pramsey@cleverelephant.ca>
Tue, 17 Oct 2017 16:54:52 +0000 (16:54 +0000)
committerPaul Ramsey <pramsey@cleverelephant.ca>
Tue, 17 Oct 2017 16:54:52 +0000 (16:54 +0000)
Closes #3907

git-svn-id: http://svn.osgeo.org/postgis/branches/2.3@15998 b70326c6-7e19-0410-871a-916f4a2858ee

NEWS
liblwgeom/cunit/cu_geodetic.c
liblwgeom/g_box.c

diff --git a/NEWS b/NEWS
index d9bd01add9db7062b8a71496d172fd3fa8774084..7525b71a9df1838d8a4641e74ee9c5b050560552 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,7 @@ PostGIS 2.3.4
   - #3882, undefined behaviour in zigzag with negative inputs
   - #3891, undefined behaviour in pointarray_to_encoded_polyline
   - #3895, throw error on malformed WKB input
+  - #3907, Allocate enough space for all possible GBOX string outputs (Raúl Marín Rodríguez)
 
 
 PostGIS 2.3.3
index ae61d0e6b738563a8224c48cbeeec8e31c806a7e..a9e9a5605b0b8ff92cefaf1be854833d9af91557 100644 (file)
@@ -1569,6 +1569,28 @@ static void test_lwgeom_area_sphere(void)
        /* end #3393 */
 }
 
+static void test_gbox_to_string_truncated(void)
+{
+       GBOX g = {
+               .flags = 0,
+               .xmin = -DBL_MAX,
+               .xmax = -DBL_MAX,
+               .ymin = -DBL_MAX,
+               .ymax = -DBL_MAX,
+               .zmin = -DBL_MAX,
+               .zmax = -DBL_MAX,
+               .mmin = -DBL_MAX,
+               .mmax = -DBL_MAX,
+       };
+       FLAGS_SET_Z(g.flags, 1);
+       FLAGS_SET_M(g.flags, 1);
+       char *c = gbox_to_string(&g);
+
+       ASSERT_STRING_EQUAL(c, "GBOX((-1.7976931e+308,-1.7976931e+308,-1.7976931e+308,-1.7976931e+308),(-1.7976931e+308,-1.7976931e+308,-1.7976931e+308,-1.7976931e+308))");
+
+       lwfree(c);
+}
+
 /*
 ** Used by test harness to register the tests in this file.
 */
@@ -1598,4 +1620,5 @@ void geodetic_suite_setup(void)
        PG_ADD_TEST(suite, test_lwgeom_segmentize_sphere);
        PG_ADD_TEST(suite, test_ptarray_contains_point_sphere);
        PG_ADD_TEST(suite, test_ptarray_contains_point_sphere_iowa);
+       PG_ADD_TEST(suite, test_gbox_to_string_truncated);
 }
index 4b8ba846d7cf51d12b5c385330cb8fb1fff75a7a..dd3194855d23dde9256fe3fe535e0b7e2d8aba3a 100644 (file)
@@ -403,7 +403,7 @@ GBOX* gbox_from_string(const char *str)
 
 char* gbox_to_string(const GBOX *gbox)
 {
-       static int sz = 128;
+       static int sz = 138;
        char *str = NULL;
 
        if ( ! gbox )