i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use of memory after it is freed

Browse Source 
Signed-off-by: Matt Madia <[email protected]>
This commit is contained in:
Murai Takashi
2013-10-20 14:41:20 -04:00
committed by Matt Madia
parent ab1ba83536
commit ebea2b79f1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/PrintJob.cpp
+6 -2
View File
@@ -241,14 +241,15 @@ BPrintJob::BeginJob()
return; return;
path.Append(printer); path.Append(printer);
free(printer);
char mangledName[B_FILE_NAME_LENGTH]; char mangledName[B_FILE_NAME_LENGTH];
_GetMangledName(mangledName, B_FILE_NAME_LENGTH); _GetMangledName(mangledName, B_FILE_NAME_LENGTH);
path.Append(mangledName); path.Append(mangledName);
if (path.InitCheck() != B_OK) if (path.InitCheck() != B_OK) {
free(printer);
return; return;
}
// TODO: fSpoolFileName should store the name only (not path which can be // TODO: fSpoolFileName should store the name only (not path which can be
// 1024 bytes long) // 1024 bytes long)
@@ -256,6 +257,7 @@ BPrintJob::BeginJob()
fSpoolFile = new BFile(fSpoolFileName, B_READ_WRITE | B_CREATE_FILE); fSpoolFile = new BFile(fSpoolFileName, B_READ_WRITE | B_CREATE_FILE);
if (fSpoolFile->InitCheck() != B_OK) { if (fSpoolFile->InitCheck() != B_OK) {
free(printer);
CancelJob(); CancelJob();
return; return;
} }
@@ -269,6 +271,7 @@ BPrintJob::BeginJob()
if (fSpoolFile->Write(&fSpoolFileHeader, sizeof(print_file_header)) if (fSpoolFile->Write(&fSpoolFileHeader, sizeof(print_file_header))
!= sizeof(print_file_header)) { != sizeof(print_file_header)) {
free(printer);
CancelJob(); CancelJob();
return; return;
} }
@@ -277,6 +280,7 @@ BPrintJob::BeginJob()
if (!fSetupMessage->HasString(PSRV_FIELD_CURRENT_PRINTER)) if (!fSetupMessage->HasString(PSRV_FIELD_CURRENT_PRINTER))
fSetupMessage->AddString(PSRV_FIELD_CURRENT_PRINTER, printer); fSetupMessage->AddString(PSRV_FIELD_CURRENT_PRINTER, printer);
free(printer);
_AddSetupSpec(); _AddSetupSpec();
_NewPage(); _NewPage();