From 45305395ad872bfdd82f47f47591e6071165192e Mon Sep 17 00:00:00 2001
From: Joshua Peraza <jperaza@chromium.org>
Date: Tue, 4 Apr 2017 09:37:42 -0700
Subject: [PATCH] win: Determine length of unloaded module names

Change-Id: I802b2a8a505cf53009c0c5648acdad7a44e9f0e7
Reviewed-on: https://chromium-review.googlesource.com/466598
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
---
 snapshot/win/process_snapshot_win.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/snapshot/win/process_snapshot_win.cc b/snapshot/win/process_snapshot_win.cc
index 7a18dbef..11df2b80 100644
--- a/snapshot/win/process_snapshot_win.cc
+++ b/snapshot/win/process_snapshot_win.cc
@@ -15,6 +15,7 @@
 #include "snapshot/win/process_snapshot_win.h"
 
 #include <stddef.h>
+#include <wchar.h>
 
 #include <algorithm>
 
@@ -325,8 +326,9 @@ void ProcessSnapshotWin::InitializeUnloadedModules() {
           uet.SizeOfImage,
           uet.CheckSum,
           uet.TimeDateStamp,
-          base::UTF16ToUTF8(
-              base::StringPiece16(uet.ImageName, arraysize(uet.ImageName)))));
+          base::UTF16ToUTF8(base::StringPiece16(
+              uet.ImageName,
+              wcsnlen(uet.ImageName, arraysize(uet.ImageName))))));
     }
   }
 }