Comment for #26196. #26219
Comment for #26196. #26219
Conversation
Fixes rust-lang#26196. Alternatively we could explicitly check and complain (eg. panic), but I don't see the value-add.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pcwalton (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
| @@ -311,6 +311,7 @@ impl ExactSizeIterator for Args { | |||
|
|
|||
| impl Drop for Args { | |||
| fn drop(&mut self) { | |||
| // NULL-safe | |||
There was a problem hiding this comment.
Could you change this to something like:
Note that
self.curcan be null (CommandLineToArgvWpreviously failed), butLocalFreeignores NULL pointers
| @@ -321,6 +323,9 @@ pub fn args() -> Args { | |||
| let lpCmdLine = c::GetCommandLineW(); | |||
| let szArgList = c::CommandLineToArgvW(lpCmdLine, &mut nArgs); | |||
|
|
|||
| // szArcList can be NULL if CommandLinToArgvW failed, | |||
| // but in that case nArgs is 0 so we won't actually | |||
| // try to read a null pointer | |||
There was a problem hiding this comment.
The docs don't guarantee that nargs is 0 on error, not what I can find. Why not check for error and set nargs to zero in that case?
There was a problem hiding this comment.
This is initialized to 0 and the function probably won't touch it in the error case.
There was a problem hiding this comment.
I agree, but to be safe you might not want to rely on a “probably”.
Fixes #26196. Alternatively we could explicitly check and complain (eg. panic), but I don't see the value-add.
Fixes #26196.
Alternatively we could explicitly check and complain (eg. panic), but I don't see the value-add.