Changeset 1348 for trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc

Timestamp:

Jan 5, 2011, 12:19:12 PM (14 years ago)

Author:

garnier

Message:

update

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc (modified) (4 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXViewer.cc,v 1.56 2010/11/10 17:57:16 allison Exp $
+// $Id: G4OpenGLXViewer.cc,v 1.57 2010/12/11 17:04:07 allison Exp $
 // GEANT4 tag $Name:  $
 //
@@ -77 +77 @@
 
 #define NewString(str) \
- ((str) != NULL ? (strcpy((char*)malloc((unsigned)strlen(str) + 1), str)) : (char*)NULL)
+  ((str) != 0 ? (strncpy((char*)malloc((unsigned)strlen(str) + 1), str, (unsigned)strlen(str) + 1)) : (char*)0)
 
 #define USE_DEFAULT_COLORMAP 1
@@ -256 +256 @@
   if (G4VisManager::GetVerbosity() >= G4VisManager::confirmations)
     G4cout << "Window name: " << fName << G4endl;
-  strncpy (charViewName, fName, 100);
+  strncpy (charViewName, fName, 99); charViewName[99] = '\0';
   char *window_name = charViewName;
   char *icon_name = charViewName;
@@ -386 +386 @@
 cmap (0)
 {
+  // To satisfy Coverity
+  xwa.visual = 0;
+  iconName.value = 0;
+  xwa.screen = 0;
+  windowName.value = 0;
+
   GetXConnection ();
   if (fViewId < 0) return;