diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-07-04 09:19:37 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-07-04 09:19:37 +0000 |
| commit | a09e1cb53be78f2b1d387bb13f6dfcb62223faf7 (patch) | |
| tree | 457b73f4ad504c56bdca7e66cb230a950424b759 /Projects/Webserver | |
| parent | 61861c548eabf6863af57a9aa20103fcd3a9aced (diff) | |
| download | lufa-a09e1cb53be78f2b1d387bb13f6dfcb62223faf7.tar.gz lufa-a09e1cb53be78f2b1d387bb13f6dfcb62223faf7.tar.bz2 lufa-a09e1cb53be78f2b1d387bb13f6dfcb62223faf7.zip | |
Switch the HTTP Webserver project to use the safer strlcpy() instead of strncpy() to save on manual null-termination.
Diffstat (limited to 'Projects/Webserver')
| -rw-r--r-- | Projects/Webserver/Lib/HTTPServerApp.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Projects/Webserver/Lib/HTTPServerApp.c b/Projects/Webserver/Lib/HTTPServerApp.c index d7585fe90..37377d0af 100644 --- a/Projects/Webserver/Lib/HTTPServerApp.c +++ b/Projects/Webserver/Lib/HTTPServerApp.c @@ -181,10 +181,7 @@ static void HTTPServerApp_OpenRequestedFile(void) } /* Copy over the requested filename */ - strncpy(AppState->HTTPServer.FileName, &RequestedFileName[1], sizeof(AppState->HTTPServer.FileName)); - - /* Ensure filename is null-terminated */ - AppState->HTTPServer.FileName[sizeof(AppState->HTTPServer.FileName) - 1] = 0x00; + strlcpy(AppState->HTTPServer.FileName, &RequestedFileName[1], sizeof(AppState->HTTPServer.FileName)); /* Determine the length of the URI so that it can be checked to see if it is a directory */ uint8_t FileNameLen = strlen(AppState->HTTPServer.FileName); @@ -192,11 +189,8 @@ static void HTTPServerApp_OpenRequestedFile(void) /* If the URI is a directory, append the default filename */ if ((AppState->HTTPServer.FileName[FileNameLen - 1] == '/') || !(FileNameLen)) { - strncpy_P(&AppState->HTTPServer.FileName[FileNameLen], DefaultDirFileName, + strlcpy_P(&AppState->HTTPServer.FileName[FileNameLen], DefaultDirFileName, (sizeof(AppState->HTTPServer.FileName) - FileNameLen)); - - /* Ensure altered filename is still null-terminated */ - AppState->HTTPServer.FileName[sizeof(AppState->HTTPServer.FileName) - 1] = 0x00; } /* Try to open the file from the Dataflash disk */ |