diff options
| author | feld <feld@feld.me> | 2024-02-14 23:28:00 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-02-14 23:28:00 +0000 |
| commit | 802c618885c69046fa89203a627a7f7f95979be3 (patch) | |
| tree | 9329101fbabd216c6b832bd2025eff73d5ae2458 | |
| parent | af9bb77cadd78d3223cbf07a35802b4a59b42a37 (diff) | |
| parent | 9138754b0acaac9714bbf12d9d00a22870b2af6e (diff) | |
| download | pleroma-802c618885c69046fa89203a627a7f7f95979be3.tar.gz pleroma-802c618885c69046fa89203a627a7f7f95979be3.zip | |
Merge branch 'atom-leaks' into 'develop'
Fix minor atom leaks
See merge request pleroma/pleroma!4065
| -rw-r--r-- | changelog.d/atom-leak.skip | 0 | ||||
| -rw-r--r-- | lib/pleroma/password/pbkdf2.ex | 2 | ||||
| -rw-r--r-- | 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 new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/atom-leak.skip diff --git a/lib/pleroma/password/pbkdf2.ex b/lib/pleroma/password/pbkdf2.ex index 92e9e1952..9c6d2e381 100644 --- 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 index 794417612..7a2210dc1 100644 --- 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{ |