Changeset 6421 for geovis

Timestamp:

Jul 7, 2016 9:39:39 PM (8 years ago)

Author:

ldelgass

Message:

Add null terminator to style sheet string copied from client command.

File:

• geovis/trunk/RendererCmd.cpp (modified) (2 diffs)

geovis/trunk/RendererCmd.cpp

@@ -1435 +1435 @@
                 return TCL_ERROR;
             }
-            char *styleSheetStr = (char *)malloc((size_t)ssSize);
+            char *styleSheetStr = (char *)malloc((size_t)(ssSize+1L));
             if (!SocketRead(styleSheetStr, ssSize)) {
                 free(styleSheetStr);
                 return TCL_ERROR;
             }
+            styleSheetStr[ssSize] = '\0';
             osgEarth::Config styleConf("style", styleSheetStr);
             free(styleSheetStr);
@@ -1762 +1763 @@
         bool lighting = true;
         osgEarth::Drivers::FeatureGeomModelOptions geomOpts;
-        char *styleSheetStr = (char *)malloc((size_t)ssSize);
+        char *styleSheetStr = (char *)malloc((size_t)(ssSize+1L));
         if (!SocketRead(styleSheetStr, ssSize)) {
             free(styleSheetStr);
             return TCL_ERROR;
         }
+        styleSheetStr[ssSize] = '\0';
         osgEarth::Config styleConf("style", styleSheetStr);
         free(styleSheetStr);