Import fixes

paolostivanin · Feb 28, 2024 · 7ef0613 · 7ef0613
1 parent e1683b9
commit 7ef0613
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/src/common/aegis.c b/src/common/aegis.c
@@ -483,15 +483,15 @@ parse_aegis_json_data (const gchar *data,
         }
 
         if (!skip) {
-            otps = g_slist_append (otps, g_memdup2 (otp, sizeof (otp_t)));
+            otps = g_slist_append (otps, otp);
+        } else {
+            gcry_free (otp->secret);
+            g_free (otp->issuer);
+            g_free (otp->account_name);
+            g_free (otp->algo);
+            g_free (otp->type);
+            g_free (otp);
         }
-
-        gcry_free (otp->secret);
-        g_free (otp->issuer);
-        g_free (otp->account_name);
-        g_free (otp->algo);
-        g_free (otp->type);
-        g_free (otp);
     }
 
     json_decref (root);

diff --git a/src/common/andotp.c b/src/common/andotp.c
@@ -314,9 +314,7 @@ parse_andotp_json_data (const gchar *data,
             json_decref (obj);
             return NULL;
         }
-
-        otps = g_slist_append (otps, g_memdup2 (otp, sizeof (otp_t)));
-        g_free (otp);
+        otps = g_slist_append (otps, otp);
     }
 
     json_decref (array);

diff --git a/src/common/authpro.c b/src/common/authpro.c
@@ -293,15 +293,15 @@ parse_authpro_json_data (const gchar *data,
         }
 
         if (!skip) {
-            otps = g_slist_append (otps, g_memdup2 (otp, sizeof (otp_t)));
+            otps = g_slist_append (otps, otp);
+        } else {
+            gcry_free (otp->secret);
+            g_free (otp->issuer);
+            g_free (otp->account_name);
+            g_free (otp->algo);
+            g_free (otp->type);
+            g_free (otp);
         }
-
-        gcry_free (otp->secret);
-        g_free (otp->issuer);
-        g_free (otp->account_name);
-        g_free (otp->algo);
-        g_free (otp->type);
-        g_free (otp);
     }
 
     json_decref (root);

diff --git a/src/common/twofas.c b/src/common/twofas.c
@@ -396,15 +396,15 @@ parse_twofas_json_data (const gchar *data,
         }
 
         if (!skip) {
-            otps = g_slist_append (otps, g_memdup2 (otp, sizeof (otp_t)));
+            otps = g_slist_append (otps, otp);
+        } else {
+            gcry_free (otp->secret);
+            g_free (otp->issuer);
+            g_free (otp->account_name);
+            g_free (otp->algo);
+            g_free (otp->type);
+            g_free (otp);
         }
-
-        gcry_free (otp->secret);
-        g_free (otp->issuer);
-        g_free (otp->account_name);
-        g_free (otp->algo);
-        g_free (otp->type);
-        g_free (otp);
     }
 
     json_decref (array);

diff --git a/src/imports.c b/src/imports.c
@@ -83,8 +83,7 @@ free_otps_gslist (GSList *otps,
         g_free (otp_data->issuer);
         gcry_free (otp_data->secret);
     }
-
-    g_slist_free_full (otps, g_free);
+    g_slist_free (otps);
 }