summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-04Snap for 9453251 from 88f50571216045a068bf28447b069364dada782c to ↵aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000android13-mainline-networking-releaseAndroid Build Coastguard Worker
mainline-networking-release Change-Id: Icf291d3c0e122a100b8c00805c643bfc18aca38a
2022-12-09[automerger skipped] Fix a bug when getting a gzip header extra field with ↵Sadaf Ebrahimi
inflate(). am: cc6c2db43e am: 1884a50ed3 -s ours am: d9dcb7b69b -s ours am: 6910c0d47a -s ours am: 5c5b81a2d4 -s ours am: 91ad92c7c9 -s ours am: b42ae7ecce -s ours am: e67541c9c8 -s ours am skip reason: skipped by user sadafebrahimi Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20550758 Change-Id: Icba98461e402dcf59efcf6bd697a125e31ce990a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Fix a bug when getting a gzip header extra field with ↵Sadaf Ebrahimi
inflate(). am: cc6c2db43e am: 1884a50ed3 -s ours am: d9dcb7b69b -s ours am: 6910c0d47a -s ours am: 5c5b81a2d4 -s ours am: 91ad92c7c9 -s ours am: b42ae7ecce -s ours am skip reason: skipped by user sadafebrahimi Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20550758 Change-Id: I6f4441d01d92ca389579b003a6bf2ded9bd3a4fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Fix a bug when getting a gzip header extra field with ↵Sadaf Ebrahimi
inflate(). am: cc6c2db43e am: 1884a50ed3 -s ours am: d9dcb7b69b -s ours am: 6910c0d47a -s ours am: 5c5b81a2d4 -s ours am: 91ad92c7c9 -s ours am skip reason: skipped by user sadafebrahimi Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20550758 Change-Id: I7cbbb5a15f2467e7e3d53391146744b4ec999e36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Fix a bug when getting a gzip header extra field with ↵Sadaf Ebrahimi
inflate(). am: cc6c2db43e am: 1884a50ed3 -s ours am: d9dcb7b69b -s ours am: 6910c0d47a -s ours am: 5c5b81a2d4 -s ours am skip reason: skipped by user sadafebrahimi Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20550758 Change-Id: I06f6771238ae2c1ef71f2108ed0af8f5f8456cf5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08[automerger skipped] Fix a bug when getting a gzip header extra field with ↵Sadaf Ebrahimi
inflate(). am: cc6c2db43e am: 1884a50ed3 -s ours am: d9dcb7b69b -s ours am: 6910c0d47a -s ours am skip reason: skipped by user sadafebrahimi Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20550758 Change-Id: I1baef7a6d0e8db07af6507bed88a7a5d62d5dc4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08[automerger skipped] Fix a bug when getting a gzip header extra field with ↵Sadaf Ebrahimi
inflate(). am: cc6c2db43e am: 1884a50ed3 -s ours am: d9dcb7b69b -s ours am skip reason: skipped by user sadafebrahimi Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20550758 Change-Id: Id828a02bad55ec87c9014b47df1549d4b5c8e322 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08[automerger skipped] Fix a bug when getting a gzip header extra field with ↵Sadaf Ebrahimi
inflate(). am: cc6c2db43e am: 1884a50ed3 -s ours am skip reason: skipped by user sadafebrahimi Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20550758 Change-Id: Ie3d0cad9c42e813bb02bb599c705e31f6a21543e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
1c4806afd7 am: 9166f7db98 am: 2cf9f01bff am: 8a773bf157 am: 6c697389df am: c5732312c6 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545926 Change-Id: I0ce2191002e9ad93949e69c3b2da21e89f0ac0b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
f8b8a9088c am: 2cde1caaff am: 10dfbbc9b2 am: 08ac66a61b am: be40c5abe7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545896 Change-Id: If9f821a0b04999d14e05b76f3b0a256c5bb3da59 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
1c4806afd7 am: 9166f7db98 am: 2cf9f01bff am: 8a773bf157 am: 6c697389df Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545926 Change-Id: I5ed1930b7a24baeb2378de29b21070bc0ba6d790 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
f8b8a9088c am: 2cde1caaff am: 10dfbbc9b2 am: 08ac66a61b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545896 Change-Id: Ie8d47fa3b56c0eae8683bc386f01d35eaa46026a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
1c4806afd7 am: 9166f7db98 am: 2cf9f01bff am: 8a773bf157 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545926 Change-Id: I0e4d426c95fc5575ae0dd7e4ef606a3f6ce25cf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
f8b8a9088c am: 2cde1caaff am: 10dfbbc9b2 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545896 Change-Id: I373375b1484c76ac53c138225488d0cb88c5e774 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Merge "Fix a bug when getting a gzip header extra field with inflate()." ↵Sadaf Ebrahimi
into sc-qpr1-dev am: 0b30b5bd18 am: fc68796726 am: 1d661f14ec Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545970 Change-Id: I57f85c3409e7413b47ef25b4ed85a4f2b90649fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06[automerge] Fix a bug when getting a gzip header extra field with inflate(). ↵Sadaf Ebrahimi
2p: 1729242482 am: c362b4c096 am: 24ade94114 am: 51ad95bb4c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545969 Change-Id: Iecf879173a9a9f76096935fea30b692389a92f44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
1c4806afd7 am: 9166f7db98 am: 2cf9f01bff Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545926 Change-Id: I6f2942c2c138a1dad25cf95714a552322c738dda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
f8b8a9088c am: 2cde1caaff Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545896 Change-Id: I67b0e6edc4bdd7057903dd8f58abb0c9fdc3a7b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Merge "Fix a bug when getting a gzip header extra field with inflate()." ↵Sadaf Ebrahimi
into sc-qpr1-dev am: 0b30b5bd18 am: fc68796726 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545970 Change-Id: I1f984196ac580620eaca50c26d4578b13df7778a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06[automerge] Fix a bug when getting a gzip header extra field with inflate(). ↵Sadaf Ebrahimi
2p: 1729242482 am: c362b4c096 am: 24ade94114 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545969 Change-Id: I3a7ec52496ed4cf2541e3bada833f6607c1f86dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Merge "Fix a bug when getting a gzip header extra field with inflate()." ↵Sadaf Ebrahimi
into sc-qpr1-dev am: 0b30b5bd18 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545970 Change-Id: I79c669fd3ad68389dca81795536c6345bc025876 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06[automerge] Fix a bug when getting a gzip header extra field with inflate(). ↵Sadaf Ebrahimi
2p: 1729242482 am: c362b4c096 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545969 Change-Id: I15b7c5e7b981afa87452fc342ff6a9812d7e9f3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
5abcd199d3 am: ac6cea2d75 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545971 Change-Id: Ied5c077d6dce61d0798e17cbaf61c06a5d404ef3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: e5a6e35a65Sadaf Ebrahimi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545899 Change-Id: I51d18fca43ba2cea278ef90aa2182c34ce2a5ee9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: cc6c2db43eSadaf Ebrahimi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20550758 Change-Id: I6c2b1efaeda09e001034d15cecd22164b72d2862 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: ↵Sadaf Ebrahimi
1c4806afd7 am: 9166f7db98 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545926 Change-Id: Ib5b73455981d0eb45d303e152f8286d1affc8f0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: f8b8a9088cSadaf Ebrahimi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545896 Change-Id: I4fc14e0877f6c601661d16421234ee5de89086db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: 5abcd199d3Sadaf Ebrahimi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545971 Change-Id: I889eca7e5ec842e8427587e61e262fb68bc31b5e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Fix a bug when getting a gzip header extra field with inflate(). am: 1c4806afd7Sadaf Ebrahimi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545926 Change-Id: I355d6b707bc1680fb305fcd647a2877cb18755ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06Merge "Fix a bug when getting a gzip header extra field with inflate()." ↵Sadaf Ebrahimi
into sc-qpr1-dev
2022-11-23Fix a bug when getting a gzip header extra field with inflate().Sadaf Ebrahimi
If the extra field was larger than the space the user provided with inflateGetHeader(), and if multiple calls of inflate() delivered the extra header data, then there could be a buffer overflow of the provided space. This commit assures that provided space is not exceeded. Bug: http://b/242299736 Test: TreeHugger Change-Id: Ic0a84a7755487f3d3b2c09abd2fd6fdd58b6d4e0
2022-11-22Fix a bug when getting a gzip header extra field with inflate().Sadaf Ebrahimi
If the extra field was larger than the space the user provided with inflateGetHeader(), and if multiple calls of inflate() delivered the extra header data, then there could be a buffer overflow of the provided space. This commit assures that provided space is not exceeded. Bug: http://b/242299736 Test: TreeHugger Change-Id: I4eabb3e135c1568e06b2b9740651a3ae11b21140
2022-11-22Fix a bug when getting a gzip header extra field with inflate().Sadaf Ebrahimi
If the extra field was larger than the space the user provided with inflateGetHeader(), and if multiple calls of inflate() delivered the extra header data, then there could be a buffer overflow of the provided space. This commit assures that provided space is not exceeded. Bug: http://b/242299736 Test: TreeHugger Change-Id: I4eabb3e135c1568e06b2b9740651a3ae11b21140
2022-11-22Fix a bug when getting a gzip header extra field with inflate().Sadaf Ebrahimi
If the extra field was larger than the space the user provided with inflateGetHeader(), and if multiple calls of inflate() delivered the extra header data, then there could be a buffer overflow of the provided space. This commit assures that provided space is not exceeded. Bug: http://b/242299736 Test: TreeHugger Change-Id: I4eabb3e135c1568e06b2b9740651a3ae11b21140
2022-11-22Fix a bug when getting a gzip header extra field with inflate().Sadaf Ebrahimi
If the extra field was larger than the space the user provided with inflateGetHeader(), and if multiple calls of inflate() delivered the extra header data, then there could be a buffer overflow of the provided space. This commit assures that provided space is not exceeded. Bug: http://b/242299736 Test: TreeHugger Change-Id: I4eabb3e135c1568e06b2b9740651a3ae11b21140
2022-11-22[automerge] Fix a bug when getting a gzip header extra field with inflate(). ↵Sadaf Ebrahimi
2p: 1729242482 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/20545969 Change-Id: I95dd5c6e7b95eb4274ace7dba735a3222b161fbe
2022-11-22Fix a bug when getting a gzip header extra field with inflate().Sadaf Ebrahimi
If the extra field was larger than the space the user provided with inflateGetHeader(), and if multiple calls of inflate() delivered the extra header data, then there could be a buffer overflow of the provided space. This commit assures that provided space is not exceeded. Bug: http://b/242299736 Test: TreeHugger Change-Id: I4eabb3e135c1568e06b2b9740651a3ae11b21140
2022-11-22Fix a bug when getting a gzip header extra field with inflate().Sadaf Ebrahimi
If the extra field was larger than the space the user provided with inflateGetHeader(), and if multiple calls of inflate() delivered the extra header data, then there could be a buffer overflow of the provided space. This commit assures that provided space is not exceeded. Bug: http://b/242299736 Test: TreeHugger Change-Id: I4eabb3e135c1568e06b2b9740651a3ae11b21140
2022-11-22Fix a bug when getting a gzip header extra field with inflate().Sadaf Ebrahimi
If the extra field was larger than the space the user provided with inflateGetHeader(), and if multiple calls of inflate() delivered the extra header data, then there could be a buffer overflow of the provided space. This commit assures that provided space is not exceeded. Bug: http://b/242299736 Test: TreeHugger Change-Id: I4eabb3e135c1568e06b2b9740651a3ae11b21140
2022-05-11Snap for 8570526 from 4b17695e63c6e11735f0f7a3d3754b1cac5da348 to ↵aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010Android Build Coastguard Worker
mainline-networking-release Change-Id: I4f0c455966722acc45d61d41576363e3f44c4d72
2022-03-25Merge "Upgrade zlib to cb89dc607cd4b85d98867f14216c3370109be64d." am: ↵aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000Florian Mayer
732c4123f3 am: 2544bc924e am: 8d26beef72 am: dc18fc32e1 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2042145 Change-Id: I6a8f975184f34cb79a6ac0ccbc244f1095dba237 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Merge "Upgrade zlib to cb89dc607cd4b85d98867f14216c3370109be64d." am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devFlorian Mayer
732c4123f3 am: 2544bc924e am: 8d26beef72 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2042145 Change-Id: If9b15e3e0ba5b74c3e23b98a68866914e0c2bd86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Merge "Upgrade zlib to cb89dc607cd4b85d98867f14216c3370109be64d." am: ↵Florian Mayer
732c4123f3 am: 2544bc924e Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2042145 Change-Id: Ic937090612b8b5a88cbdaf674a6a2652a5320fda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Merge "Upgrade zlib to cb89dc607cd4b85d98867f14216c3370109be64d." am: 732c4123f3Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2042145 Change-Id: Ibb2ca5b7e9f7362d71f162613b53efd1f8cd9bc2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Merge "Upgrade zlib to cb89dc607cd4b85d98867f14216c3370109be64d."Florian Mayer
2022-03-24Upgrade zlib to cb89dc607cd4b85d98867f14216c3370109be64d.Florian Mayer
Change-Id: Ia3da3de37028979a4ecb0025ebb26fe49b9197e4
2022-03-23Fix out-of-bounds in infcover tests.Florian Mayer
Upstream zlib pull request: https://github.com/madler/zlib/pull/602 Bug: 225069280 Change-Id: I548a836096323053af225083916893b851532980 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3546708 Reviewed-by: Noel Gordon <noel@chromium.org> Commit-Queue: Noel Gordon <noel@chromium.org> Cr-Commit-Position: refs/heads/main@{#984579} NOKEYCHECK=True GitOrigin-RevId: afa134512eec0ab985c64bc39e39b0bb5212f8f6
2022-03-21Avoid including base/files/file_util.h in some headers.Lei Zhang
Rarely would anyone ever use base/files/file_util.h functions inside a header. Most code authors meant to include base/files/file_path.h or forward declare base::FilePath. Do that and then add missing file_util.h includes to fix the build. Bug: 242216 Change-Id: I6280125f310cff0db1109c401d84e01aba386376 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3518311 Reviewed-by: Nico Weber <thakis@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org> Owners-Override: Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/main@{#983450} NOKEYCHECK=True GitOrigin-RevId: 527964a214baed4f325c0d7751bfc527ba10bf34
2022-03-18[zip] Add UnzipOptions::continue_on_errorFrançois Degros
Added an option allowing the ZIP extraction to continue and try to extract as many files as possible even if some file extractions fail. BUG=chromium:953256 TEST=autoninja -C out/Default zlib_unittests && out/Default/zlib_unittests Change-Id: I2ddbfbdb3abe5d0cca3023d93fdff7fcdfc9baab Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3523968 Reviewed-by: Alex Danilo <adanilo@chromium.org> Commit-Queue: François Degros <fdegros@chromium.org> Cr-Commit-Position: refs/heads/main@{#982666} NOKEYCHECK=True GitOrigin-RevId: abc9bcb7f1c7757409f4f0ef6e1089c0276bb7e7
2022-03-16[zip] Unzip() does not overwrite files anymoreFrançois Degros
Changed the way FilePathWriterDelegate creates a new file, by using FLAG_CREATE instead of FLAG_CREATE_ALWAYS. This prevents FilePathWriterDelegate and zip::Unzip() from overwriting any existing file. This allows the detection of duplicated or conflicting file names when extracting a ZIP archive. See ZipTest.UnzipRepeatedFileName. This fixes a confusing corner case on case-insensitive file systems, which could result in file contents not matching file names as stored in the ZIP archive. See ZipTest.UnzipDifferentCases. BUG=chromium:953256 TEST=autoninja -C out/Default zlib_unittests && out/Default/zlib_unittests Change-Id: I6cf80e6d8b9e39ffc76739c00cb6f2ecf57da88f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3529591 Reviewed-by: Alex Danilo <adanilo@chromium.org> Commit-Queue: François Degros <fdegros@chromium.org> Cr-Commit-Position: refs/heads/main@{#982048} NOKEYCHECK=True GitOrigin-RevId: 7ba6004ba3727e9f5339841cfe0f54e7e51dfbf2