Fixing memory corruption when passing additional scopes.

Change-Id: I3d27930e4d077ee288d1ebc892fd9a4401dc25a3

Author: claywilkinson

.gitignore

@@ -16,6 +16,8 @@ ProjectSettings/
 Temp/
 obj/
 
+.DS_Store
+
 # Don't check in the resolver
 GoogleSignInPlugin/Assets/PlayServicesResolver/
 

native-googlesignin/src/main/cpp/google_signin.cc

@@ -229,10 +229,6 @@ void GoogleSignIn::GoogleSignInImpl::Configure(
   delete current_configuration_;
   current_configuration_ = new Configuration(configuration);
 
-  if (configuration.web_client_id) {
-    current_configuration_->web_client_id = strdup(configuration.web_client_id);
-  }
-
   delete current_result_;
   current_result_ = new GoogleSignInFuture();
 
@@ -247,26 +243,24 @@ void GoogleSignIn::GoogleSignInImpl::CallConfigure() {
     return;
   }
   jstring j_web_client_id =
-      current_configuration_->web_client_id
-          ? env->NewStringUTF(current_configuration_->web_client_id)
-          : nullptr;
+      current_configuration_->web_client_id.empty() ? nullptr
+          : env->NewStringUTF(current_configuration_->web_client_id.c_str());
 
   jstring j_account_name =
-      current_configuration_->account_name
-          ? env->NewStringUTF(current_configuration_->account_name)
-          : nullptr;
+      current_configuration_->account_name.empty() ? nullptr
+          : env->NewStringUTF(current_configuration_->account_name.c_str());
 
   jobjectArray j_auth_scopes = nullptr;
 
-  if (current_configuration_->additional_scope_count > 0) {
+  if (current_configuration_->additional_scopes.size() > 0) {
     jclass string_clazz = FindClass("java/lang/String", activity_);
     j_auth_scopes = env->NewObjectArray(
-        current_configuration_->additional_scope_count, string_clazz, nullptr);
+            current_configuration_->additional_scopes.size(), string_clazz, nullptr);
 
-    for (int i = 0; i < current_configuration_->additional_scope_count; i++) {
+    for (int i = 0; i < current_configuration_->additional_scopes.size(); i++) {
       env->SetObjectArrayElement(
           j_auth_scopes, i,
-          env->NewStringUTF(current_configuration_->additional_scopes[i]));
+          env->NewStringUTF(current_configuration_->additional_scopes[i].c_str()));
     }
     env->DeleteLocalRef(string_clazz);
   }

native-googlesignin/src/main/cpp/google_signin.h

@@ -20,6 +20,8 @@
 #endif
 
 #include <jni.h>
+#include <string>
+#include <vector>
 
 #include "future.h"              // NOLINT
 #include "google_signin_user.h"  // NOLINT
@@ -90,7 +92,7 @@ class GoogleSignIn {
     /// true to use games signin, false for default signin.
     bool use_game_signin;
     /// web client id associated with this app.
-    const char *web_client_id;
+    std::string web_client_id;
     /// true for getting an auth code when authenticating.
     /// Note: This may trigger re-consent on iOS.  Ideally, this
     /// is set to true once, and the result sent to the server where the
@@ -107,11 +109,11 @@ class GoogleSignIn {
     /// recommended for VR applications.
     bool hide_ui_popups;
     /// account name to use when authenticating, null indicates use default.
-    const char *account_name;
+    std::string account_name;
     /// additional scopes to request, requires consent.
-    const char **additional_scopes;
-    int additional_scope_count;
+    std::vector<std::string> additional_scopes;
 
+    Configuration() = default;
     ~Configuration() = default;
     Configuration(Configuration const &copy) = default;
     Configuration(Configuration &&move) = delete;

native-googlesignin/src/main/cpp/google_signin_bridge.cc

@@ -103,17 +103,27 @@ void GoogleSignIn_Configure(GoogleSignIn_t self, bool useGameSignIn,
                             bool requestIdToken, bool hidePopups,
                             const char **additional_scopes, int scopes_count,
                             const char *accountName) {
-  self->wrapped_->Configure(googlesignin::GoogleSignIn::Configuration{
-      .use_game_signin = useGameSignIn,
-      .web_client_id = webClientId,
-      .request_auth_code = requestAuthCode,
-      .force_token_refresh = forceTokenRefresh,
-      .request_email = requestEmail,
-      .request_id_token = requestIdToken,
-      .hide_ui_popups = hidePopups,
-      .additional_scopes = additional_scopes,
-      .additional_scope_count = scopes_count,
-      .account_name = accountName});
+  googlesignin::GoogleSignIn::Configuration configuration;
+
+  configuration.use_game_signin = useGameSignIn;
+  if (webClientId) {
+    configuration.web_client_id = webClientId;
+  }
+  configuration.request_auth_code = requestAuthCode;
+  configuration.force_token_refresh = forceTokenRefresh;
+  configuration.request_email = requestEmail;
+  configuration.request_id_token = requestIdToken;
+  configuration.hide_ui_popups = hidePopups;
+  if (accountName) {
+    configuration.account_name = accountName;
+  }
+  if (scopes_count) {
+    for(int i=0;i<scopes_count;i++) {
+      configuration.additional_scopes.push_back(std::string(additional_scopes[i]));
+    }
+  }
+
+  self->wrapped_->Configure(configuration);
 }
 
 GoogleSignInFuture_t GoogleSignIn_SignIn(GoogleSignIn_t self) {