Expand coverage of try-catch so that assertion errors are always caught

canonical · Sep 26, 2023 · c0d5d6a · c0d5d6a
1 parent 6f28e2a
commit c0d5d6a
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/msix/storeapi/StoreApi.cpp b/msix/storeapi/StoreApi.cpp
@@ -46,16 +46,16 @@ void logError(std::string_view functionName, std::string_view errMsg) {
 
 Int GetSubscriptionExpirationDate(const char* productID,
                                   std::int64_t* expirationUnix) {
-  if (auto err = validateArg(productID, MaxProductIdLen);
-      err != StoreApi::ErrorCode::None) {
-    return toInt(err);
-  }
+  try {
+    if (auto err = validateArg(productID, MaxProductIdLen);
+        err != StoreApi::ErrorCode::None) {
+      return toInt(err);
+    }
 
-  if (expirationUnix == nullptr) {
-    return toInt(StoreApi::ErrorCode::NullOutputPtr);
-  }
+    if (expirationUnix == nullptr) {
+      return toInt(StoreApi::ErrorCode::NullOutputPtr);
+    }
 
-  try {
     StoreApi::ServerStoreService service{};
 
     *expirationUnix = service.CurrentExpirationDate(productID);
@@ -75,16 +75,16 @@ Int GetSubscriptionExpirationDate(const char* productID,
 
 Int GenerateUserJWT(const char* accessToken, char** userJWT,
                     std::uint64_t* userJWTLen) {
-  if (auto err = validateArg(accessToken, MaxTokenLen);
-      err != StoreApi::ErrorCode::None) {
-    return toInt(err);
-  }
+  try {
+    if (auto err = validateArg(accessToken, MaxTokenLen);
+        err != StoreApi::ErrorCode::None) {
+      return toInt(err);
+    }
 
-  if (userJWT == nullptr || userJWTLen == nullptr) {
-    return toInt(StoreApi::ErrorCode::NullOutputPtr);
-  }
+    if (userJWT == nullptr || userJWTLen == nullptr) {
+      return toInt(StoreApi::ErrorCode::NullOutputPtr);
+    }
 
-  try {
     StoreApi::ServerStoreService service{};
     auto user = service.CurrentUserInfo();
     const std::string jwt = service.GenerateUserJwt(accessToken, user);