Fix local server timestamp handling on 32-bit architectures (#939)

jonsimantov · web-flow · commit 817de8648690 · 2022-05-09T17:53:25.000Z
* Fix RTDB 32-bit bug

* Update readme

* Format code.
diff --git a/database/src/desktop/core/server_values.cc b/database/src/desktop/core/server_values.cc
@@ -28,7 +28,8 @@ static const char kNameSubkeyServerValue[] = ".sv";
 
 Variant GenerateServerValues(int64_t server_time_offset) {
   Variant server_values = Variant::EmptyMap();
-  int64_t corrected_time = time(nullptr) * 1000L + server_time_offset;
+  int64_t corrected_time =
+      static_cast<int64_t>(time(nullptr)) * 1000L + server_time_offset;
   server_values.map()["timestamp"] = Variant::FromInt64(corrected_time);
   return server_values;
 }
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
@@ -584,6 +584,8 @@ code.
         the Google-Mobile-Ads-SDK Cocoapod, "7.69.0-cppsdk2", to maintain
         compatibility with version 9.x of the Firebase iOS SDK.
     -   Analytics: Removed deprecated event names and parameters.
+    -   Realtime Database (Desktop): Fixed a bug handling server timestamps
+        on 32-bit CPUs.
     -   Storage (Desktop): Set Content-Type HTTP header when uploading with
         custom metadata.
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ static const char kNameSubkeyServerValue[] = ".sv";`
`28`	`28`
`29`	`29`	`Variant GenerateServerValues(int64_t server_time_offset) {`
`30`	`30`	`Variant server_values = Variant::EmptyMap();`
`31`		`- int64_t corrected_time = time(nullptr) * 1000L + server_time_offset;`
	`31`	`+ int64_t corrected_time =`
	`32`	`+ static_cast<int64_t>(time(nullptr)) * 1000L + server_time_offset;`
`32`	`33`	`server_values.map()["timestamp"] = Variant::FromInt64(corrected_time);`
`33`	`34`	`return server_values;`
`34`	`35`	`}`