[GRASS-SVN] r62426 - in grass/branches/releasebranch_7_0: . vector/v.in.ogr

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Oct 27 15:33:31 PDT 2014


Author: martinl
Date: 2014-10-27 15:33:31 -0700 (Mon, 27 Oct 2014)
New Revision: 62426

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c
Log:
v.in.ogr: enlarge buffer to avoid segfault on long text attributes
          (merge r62425 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:61095,61788,61897,62141,62327,62346,62352,62354,62356,62360,62364,62415
   + /grass/trunk:61095,61788,61897,62141,62327,62346,62352,62354,62356,62360,62364,62415,62425

Modified: grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c	2014-10-27 22:29:17 UTC (rev 62425)
+++ grass/branches/releasebranch_7_0/vector/v.in.ogr/main.c	2014-10-27 22:33:31 UTC (rev 62426)
@@ -66,7 +66,7 @@
     double xmin, ymin, xmax, ymax;
     int ncols = 0, type;
     double min_area, snap;
-    char buf[2000], namebuf[2000];
+    char buf[DB_SQL_MAX], namebuf[1024];
     char *separator;
     
     struct Key_Value *loc_proj_info, *loc_proj_units;



More information about the grass-commit mailing list