Ensure that fileno() returns -1 when given an invalid file pointer. #2157
Conversation
| @@ -2420,7 +2420,9 @@ LibraryManager.library = { | |||
| fileno: function(stream) { | |||
| // int fileno(FILE *stream); | |||
| // http://pubs.opengroup.org/onlinepubs/000095399/functions/fileno.html | |||
| return FS.getStreamFromPtr(stream).fd; | |||
| stream = FS.getStreamFromPtr(stream); | |||
| if (!stream) return -1; | |||
There was a problem hiding this comment.
As part of #20, could you break the conditional into three lines:
if (!stream) {
return -1;
}
|
rebased with style tweak |
|
thx @rfk! |
|
Sorry to hassle you here, but actually that was not accurate - it is valid to do @haneefmubarak , this might not be a common convention in other projects, but it is used throughout emscripten. What is not acceptable in emscripten is , we disallow that without curly braces. But, braces are not needed for short stuff fitting on the same line. |
|
With that style thing reverted, this looks good. @rfk , any chance you can make a small testcase for this or add to an existing one, so we don't regress it later? |
|
rebased and added stand-alone testcase for fileno() with both valid and invalid stream pointer. |
Ensure that fileno() returns -1 when given an invalid file pointer.
|
Thanks! |
Previously this would throw since getStreamFromPtr returns
undefinedfor invalid file pointers.