Merge topic 'prevent-buffer-overflow' into master

d7ec6c1b AVIWriter: Fix a comment typo
3e7585ca AVIWriter: Don't overflow the fourcc storage

IO/Movie/vtkAVIWriter.cxx

@@ -141,7 +141,8 @@ void vtkAVIWriter::Start()
   char fourcc[4] = {' ', ' ', ' ', ' '};
   if (this->CompressorFourCC)
     {
-    memcpy(fourcc, this->CompressorFourCC, strlen(this->CompressorFourCC));
+    size_t len = strlen(this->CompressorFourCC);
+    memcpy(fourcc, this->CompressorFourCC, len > 4 ? 4 : len);
     }
   opts.fccHandler=mmioFOURCC(fourcc[0], fourcc[1], fourcc[2], fourcc[3]);
   switch (this->GetQuality())

IO/Movie/vtkAVIWriter.h

@@ -70,7 +70,7 @@ public:
   // Common identifiers include DIVX, XVID, and H264.
   // http://en.wikipedia.org/wiki/FourCC.
   // Default value is:
-  //   - msvc
+  //   - MSVC
   // Other examples include:
   //   - DIB: Full Frames (Uncompressed)
   //   - LAGS: Lagarith Lossless Codec