Skip to content

[native_toolchain_c] check null instead of assert #2110

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

Merged
dcharkes merged 2 commits into from
Mar 20, 2025
Merged

[native_toolchain_c] check null instead of assert #2110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cb8c58
check null instead of assert
MichealReed Mar 19, 2025
369e973
return empty instead of guard
MichealReed Mar 20, 2025
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
2 changes: 1 addition & 1 deletion pkgs/native_toolchain_c/lib/src/tool/tool_resolver.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ class InstallLocationResolver implements ToolResolver {
Future<List<Uri>> tryResolvePath(String path) async {
if (path.startsWith(home)) {
Copy link
Collaborator

@dcharkes dcharkes Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it starts with $HOME, and homeDir_ is null, shouldn't we simply return []; early?

Copy link
Collaborator

@dcharkes dcharkes Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering why this could ever be null anyway, it should not be.

#2112

Copy link
Contributor Author

@MichealReed MichealReed Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you still want to null check this? or should we close it? Maybe an env issue could still cause null here.

Copy link
Collaborator

@dcharkes dcharkes Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it wouldn't hurt to check and return [] if there is no home. Then at least the code doesn't crash if the home path environment variable isn't set. 👍

Copy link
Contributor Author

@MichealReed MichealReed Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, should be all set now.

Copy link
Collaborator

@dcharkes dcharkes Mar 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contributions @MichealReed ! 🙏

final homeDir_ = homeDir;
assert(homeDir_ != null);
if (homeDir_ == null) return [];
path = path.replaceAll(
'$home/',
homeDir!.toFilePath().replaceAll('\\', '/'),
Expand Down