github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-31 02:16:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3968 from penpot/niwinz-staging-storage-improvements-2

Browse Source 
🐛 Fix incorrect pointer deref on validating file on update operation
This commit is contained in:
Alejandro 2024-01-04 16:48:23 +01:00 committed by GitHub
commit 08cd2ddf1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/app/rpc/commands/files_update.clj
View File

@ -306,7 +306,7 @@
(binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id) (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)
pmap/*tracked* nil] pmap/*tracked* nil]
(-> (files/get-file cfg id :migrate? false) (-> (files/get-file cfg id :migrate? false)
(feat.fdata/process-pointers deref) ; ensure all pointers resolved (update :data feat.fdata/process-pointers deref) ; ensure all pointers resolved
(fmg/migrate-file)))))) (fmg/migrate-file))))))
(d/index-by :id))) (d/index-by :id)))

4
backend/src/app/srepl/helpers.clj
View File

@ -83,7 +83,7 @@
(into [file] (map (fn [{:keys [id]}] (into [file] (map (fn [{:keys [id]}]
(binding [pmap/*load-fn* (partial feat.fdata/load-pointer system id)] (binding [pmap/*load-fn* (partial feat.fdata/load-pointer system id)]
(-> (files/get-file system id :migrate? false) (-> (files/get-file system id :migrate? false)
(feat.fdata/process-pointers deref) (update :data feat.fdata/process-pointers deref)
(pmg/migrate-file)))))) (pmg/migrate-file))))))
(d/index-by :id))] (d/index-by :id))]
(validate/validate-file file libs)))))) (validate/validate-file file libs))))))
@ -101,7 +101,7 @@
(into [file] (map (fn [{:keys [id]}] (into [file] (map (fn [{:keys [id]}]
(binding [pmap/*load-fn* (partial feat.fdata/load-pointer system id)] (binding [pmap/*load-fn* (partial feat.fdata/load-pointer system id)]
(-> (files/get-file system id :migrate? false) (-> (files/get-file system id :migrate? false)
(feat.fdata/process-pointers deref) (update :data feat.fdata/process-pointers deref)
(pmg/migrate-file)))))) (pmg/migrate-file))))))
(d/index-by :id)) (d/index-by :id))
errors (validate/validate-file file libs) errors (validate/validate-file file libs)