Various fixes (#52)

lbartnik · web-flow · commit 212bf3a8e51f · 2017-10-04T11:00:03.000-07:00
* fix initialization

* fix clang-UBSAN error
diff --git a/src/sub-linux.cc b/src/sub-linux.cc
@@ -82,7 +82,9 @@ static time_t clock_millisec ()
   clock_gettime(CLOCK_REALTIME, &current);
 #endif
 
-  return (int)current.tv_sec * 1000 + (int)(current.tv_nsec / 1000000);
+  long long current_time = static_cast<long long>(current.tv_sec) * 1000L +
+                           static_cast<long long>(current.tv_nsec / 1000000L);
+  return static_cast<time_t>(current_time);
 }
 
 
diff --git a/src/subprocess.cc b/src/subprocess.cc
@@ -59,7 +59,7 @@ size_t consume_utf8 (const char * _input, size_t _length)
 {
   wchar_t wc;
   size_t used, consumed = 0;
-  mbstate_t mb_st { 0 };
+  mbstate_t mb_st = { };
 
   if (!mbsinit(&mb_st)) memset(&mb_st,0,sizeof(mb_st));
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,9 @@ static time_t clock_millisec ()`
`82`	`82`	`clock_gettime(CLOCK_REALTIME, &current);`
`83`	`83`	`#endif`
`84`	`84`
`85`		`- return (int)current.tv_sec * 1000 + (int)(current.tv_nsec / 1000000);`
	`85`	`+ long long current_time = static_cast<long long>(current.tv_sec) * 1000L +`
	`86`	`+ static_cast<long long>(current.tv_nsec / 1000000L);`
	`87`	`+ return static_cast<time_t>(current_time);`
`86`	`88`	`}`
`87`	`89`
`88`	`90`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ size_t consume_utf8 (const char * _input, size_t _length)`
`59`	`59`	`{`
`60`	`60`	`wchar_t wc;`
`61`	`61`	`size_t used, consumed = 0;`
`62`		`- mbstate_t mb_st { 0 };`
	`62`	`+ mbstate_t mb_st = { };`
`63`	`63`
`64`	`64`	`if (!mbsinit(&mb_st)) memset(&mb_st,0,sizeof(mb_st));`
`65`	`65`