Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
994e8faa
Unverified
Commit
994e8faa
authored
May 27, 2018
by
Terry Ellison
Committed by
GitHub
May 27, 2018
Browse files
Merge pull request #2383 from dnc40085/dev_file.read()_retval_fix
Fix for lack of nil return in file.read() when EOF is reached
parents
7a54ae06
cbcb1b1a
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/modules/file.c
View file @
994e8faa
...
@@ -432,7 +432,8 @@ static int file_g_read( lua_State* L, int n, int16_t end_char, int fd )
...
@@ -432,7 +432,8 @@ static int file_g_read( lua_State* L, int n, int16_t end_char, int fd )
luaM_free
(
L
,
heap_mem
);
luaM_free
(
L
,
heap_mem
);
heap_mem
=
NULL
;
heap_mem
=
NULL
;
}
}
return
0
;
lua_pushnil
(
L
);
return
1
;
}
}
vfs_lseek
(
fd
,
-
(
n
-
i
),
VFS_SEEK_CUR
);
vfs_lseek
(
fd
,
-
(
n
-
i
),
VFS_SEEK_CUR
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment