Skip to content

fix(Texture2D): avoid resource lookup for empty StreamData.path #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Agent-0808 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(Texture2D): avoid resource lookup for empty StreamData.path #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion UnityPy/classes/legacy_patch/Texture2D.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ def _Texture2d_set_image(
def _Texture2D_get_image_data(self: Texture2D):
if self.image_data:
return self.image_data
if self.m_StreamData:
# a stream data object without a path is a leftover of incomplete assets
# and must not be used to resolve a resource file
if self.m_StreamData and self.m_StreamData.path:
from ...helpers.ResourceReader import get_resource_data

return get_resource_data(
Expand Down
2 changes: 2 additions & 0 deletions UnityPy/helpers/ResourceReader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

def get_resource_data(res_path: str, assets_file: "SerializedFile", offset: int, size: int):
basename = ntpath.basename(res_path)
if not basename:
raise ValueError(f"Invalid resource path: {res_path!r}")
name, ext = ntpath.splitext(basename)
possible_names = [
basename,
Expand Down