archive-gh-me/pointcloud
1
0
Fork 0
mirror of https://github.com/pgpointcloud/pointcloud.git synced 2025-12-08 20:36:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash on cloning schema with missing dimension name/description

Browse Source 
Closes #66
Includes testcase
This commit is contained in:
Sandro Santilli 2015-04-09 16:00:27 +02:00
parent 53b4fa1dcb
commit 3011d8dace
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/cunit/cu_pc_schema.c
View File

@ -147,8 +147,10 @@ static void
test_schema_clone(void)
{
int i;
PCSCHEMA *myschema;
PCSCHEMA *clone = pc_schema_clone(schema);
hashtable *hash, *chash;
char *xmlstr;
CU_ASSERT_EQUAL(clone->pcid, schema->pcid);
CU_ASSERT_EQUAL(clone->ndims, schema->ndims);
CU_ASSERT_EQUAL(clone->size, schema->size);
@ -185,6 +187,17 @@ test_schema_clone(void)
}
pc_schema_free(clone);
/* See https://github.com/pgpointcloud/pointcloud/issues/66 */
xmlstr = "<pc:PointCloudSchema xmlns:pc='x'><pc:dimension><pc:position>1</pc:position></pc:dimension></pc:PointCloudSchema>";
i = pc_schema_from_xml(xmlstr, &myschema);
CU_ASSERT_EQUAL(i, PC_SUCCESS);
clone = pc_schema_clone(myschema);
CU_ASSERT_EQUAL(clone->ndims, myschema->ndims);
CU_ASSERT_EQUAL(clone->dims[0]->name, NULL);
CU_ASSERT_EQUAL(clone->dims[0]->description, NULL);
pc_schema_free(myschema);
pc_schema_free(clone);
}
/* REGISTER ***********************************************************/

4
lib/pc_schema.c
View File

@ -164,8 +164,8 @@ pc_dimension_clone(const PCDIMENSION *dim)
/* Copy all the inline data */
memcpy(pcd, dim, sizeof(PCDIMENSION));
/* Copy the referenced data */
pcd->name = pcstrdup(dim->name);
pcd->description = pcstrdup(dim->description);
if ( dim->name ) pcd->name = pcstrdup(dim->name);
if ( dim->description ) pcd->description = pcstrdup(dim->description);
return pcd;
}