--- a/intl/locale/LocaleService.cpp
+++ b/intl/locale/LocaleService.cpp
@@ -292,22 +292,34 @@ bool LocaleService::LanguagesMatch(const
 }
 
 bool LocaleService::IsServer() { return mIsServer; }
 
 static bool GetGREFileContents(const char* aFilePath, nsCString* aOutString) {
   // Look for the requested file in omnijar.
   RefPtr<CacheAwareZipReader> zip = Omnijar::GetReader(Omnijar::GRE);
   if (zip) {
-    uint32_t length;
-    const uint8_t* data = zip->GetData(aFilePath, &length);
-    if (!data) {
+    const auto item = zip->GetItem(aFilePath);
+    if (!item) {
       return false;
     }
-    aOutString->Assign(reinterpret_cast<const char*>(data), length);
+
+    MOZ_ASSERT(item->RealSize());
+
+    auto data = MakeUnique<uint8_t>(item->RealSize());
+    CacheAwareZipCursor cursor(item, zip, data.get(), item->RealSize());
+
+    uint32_t count;
+    cursor.Read(&count);
+
+    if (count != item->RealSize()) {
+      return false;
+    }
+
+    aOutString->Assign(reinterpret_cast<const char*>(data.get()), count);
     return true;
   }
 
   // If we didn't have an omnijar (i.e. we're running a non-packaged
   // build), then look in the GRE directory.
   nsCOMPtr<nsIFile> path;
   if (NS_FAILED(nsDirectoryService::gService->Get(
           NS_GRE_DIR, NS_GET_IID(nsIFile), getter_AddRefs(path)))) {