pleroma

commit: 802c618885c69046fa89203a627a7f7f95979be3
parent af9bb77cadd78d3223cbf07a35802b4a59b42a37
Author: feld <feld@feld.me>
Date:   Wed, 14 Feb 2024 23:28:00 +0000

Merge branch 'atom-leaks' into 'develop'

Fix minor atom leaks

See merge request pleroma/pleroma!4065
Diffstat:
A
changelog.d/atom-leak.skip
0

M
lib/pleroma/password/pbkdf2.ex
2
+-
M
lib/pleroma/workers/background_worker.ex
2
+-

3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/changelog.d/atom-leak.skip b/changelog.d/atom-leak.skip
diff --git a/lib/pleroma/password/pbkdf2.ex b/lib/pleroma/password/pbkdf2.ex
@@ -28,7 +28,7 @@ defmodule Pleroma.Password.Pbkdf2 do
 
     iterations = String.to_integer(iterations)
 
-    digest = String.to_atom(digest)
+    digest = String.to_existing_atom(digest)
 
     binary_hash =
       KeyGenerator.generate(password, salt, digest: digest, iterations: iterations, length: 64)
diff --git a/lib/pleroma/workers/background_worker.ex b/lib/pleroma/workers/background_worker.ex
@@ -28,7 +28,7 @@ defmodule Pleroma.Workers.BackgroundWorker do
   def perform(%Job{args: %{"op" => op, "user_id" => user_id, "identifiers" => identifiers}})
       when op in ["blocks_import", "follow_import", "mutes_import"] do
     user = User.get_cached_by_id(user_id)
-    {:ok, User.Import.perform(String.to_atom(op), user, identifiers)}
+    {:ok, User.Import.perform(String.to_existing_atom(op), user, identifiers)}
   end
 
   def perform(%Job{