Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix buffer overflow on prompt, conditionalized floppy support.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5660 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2003-12-12 12:47:33 +00:00
parent c9fec498f8
commit 4cba418c34
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/apps/bin/mkdos/mkdos.cpp
View File

@ -36,6 +36,8 @@ THE SOFTWARE.
#include <getopt.h>
#include "fat.h"
#define WITH_FLOPPY_SUPPORT
void PrintUsage();
void CreateVolumeLabel(void *sector, const char *label);
status_t Initialize(int fatbits, const char *device, const char *label, bool noprompt, bool testmode);
@ -135,6 +137,7 @@ status_t Initialize(int fatbits, const char *device, const char *label, bool nop
return B_ERROR;
}
//XXX the following two checks can be removed when this is fixed:
#ifndef WITH_FLOPPY_SUPPORT
if (0 != strstr(device,"floppy")) {
fprintf(stderr,"Error: floppy B_GET_GEOMETRY and B_GET_BIOS_GEOMETRY calls are broken, floppy not supported\n");
return B_ERROR;
@ -143,6 +146,7 @@ status_t Initialize(int fatbits, const char *device, const char *label, bool nop
fprintf(stderr,"Error: can't create a 12 bit fat on a device other than floppy\n");
return B_ERROR;
}
#endif
printf("device = %s\n",device);
@ -429,8 +433,15 @@ status_t Initialize(int fatbits, const char *device, const char *label, bool nop
printf("Initializing will erase all existing data on the drive.\n");
printf("Do you wish to proceed? ");
char answer[1000];
scanf("%s",answer); //XXX who wants to fix this buffer overflow?
if (0 != strcasecmp(answer,"yes")) {
char *p = answer;
memset(answer, 0, 1000);
fflush(stdout);
while ((p < answer + 1000) && (read(0, p, 1) == 1) && (*p != '\n') && (*p != '\r'))
p++;
*p = '\0';
//scanf("%s",answer); //XXX who wants to fix this buffer overflow?
if ((strlen(answer) < 1) || (0 != strncasecmp(answer, "yes", strlen(answer)))) {
printf("drive NOT initialized\n");
close(fd);
return B_OK;