mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport two nullpointer reference fixes from QtWebApp 1.7.4

Browse Source
This commit is contained in:
Felix Kauselmann 2018-05-26 10:30:14 +02:00
parent 1c4eb4d1c6
commit 9851884021
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
YACReaderLibrary/server/lib/httpserver/httprequest.cpp
View File

@ -460,16 +460,23 @@ void HttpRequest::parseMultiPartFile()
else if (!fileName.isEmpty() && !fieldName.isEmpty()) else if (!fileName.isEmpty() && !fieldName.isEmpty())
{ {
// last field was a file // last field was a file
#ifdef SUPERVERBOSE if (uploadedFile)
qDebug("HttpRequest: finishing writing to uploaded file"); {
#endif #ifdef SUPERVERBOSE
uploadedFile->resize(uploadedFile->size()-2); qDebug("HttpRequest: finishing writing to uploaded file");
uploadedFile->flush(); #endif
uploadedFile->seek(0); uploadedFile->resize(uploadedFile->size()-2);
parameters.insert(fieldName,fileName); uploadedFile->flush();
qDebug("HttpRequest: set parameter %s=%s",fieldName.data(),fileName.data()); uploadedFile->seek(0);
uploadedFiles.insert(fieldName,uploadedFile); parameters.insert(fieldName,fileName);
qDebug("HttpRequest: uploaded file size is %i",(int) uploadedFile->size()); qDebug("HttpRequest: set parameter %s=%s",fieldName.data(),fileName.data());
uploadedFiles.insert(fieldName,uploadedFile);
qDebug("HttpRequest: uploaded file size is %i",(int) uploadedFile->size());
}
else
{
qWarning("HttpRequest: format error, unexpected end of file data");
}
} }
if (line.contains(boundary+"--")) if (line.contains(boundary+"--"))
{ {
@ -546,4 +553,3 @@ QHostAddress HttpRequest::getPeerAddress() const
{ {
return peerAddress; return peerAddress;
} }

2
YACReaderLibrary/server/lib/logging/filelogger.cpp
View File

@ -92,8 +92,8 @@ void FileLogger::write(const LogMessage* logMessage)
// Check for success // Check for success
if (file->error()) if (file->error())
{ {
close();
qWarning("Cannot write to log file %s: %s",qPrintable(fileName),qPrintable(file->errorString())); qWarning("Cannot write to log file %s: %s",qPrintable(fileName),qPrintable(file->errorString()));
close();
} }
} }