@@ -11,10 +11,13 @@
 #include <ppapi/cpp/core.h>
 #include <ppapi/cpp/var.h>
 #include <ppapi/cpp/var_dictionary.h>
 #include <ppapi/cpp/var_array.h>
 #include <ppapi/cpp/var_array_buffer.h>
+
+#include <string.h>
+#include <stdlib.h>
 
 #include "pcsc-nacl.h"
 #include "cackey-chrome.h"
 
 class CACKeyInstance : public pp::Instance {
@@ -52,14 +55,16 @@
 			 */
 			reply = new pp::VarDictionary();
 
 			if (command.AsString() == "init") {
 				if (message->HasKey("smartcardManagerAppId")) {
-					smartcardManagerAppId = message->Get("smartcardManagerAppId").AsString().c_str();
+					smartcardManagerAppId = strdup(message->Get("smartcardManagerAppId").AsString().c_str());
 				}
 
 				pcscNaClInit(this, corePointer, smartcardManagerAppId, "CACKey");
+
+				free((void *) smartcardManagerAppId);
 
 				reply->Set("status", "success");
 			} else if (command.AsString() == "listcertificates") {
 				numCertificates = cackey_chrome_listCertificates(&certificates);