1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix leak when fd != -1

Browse Source 
Change-Id: I07bcf4b678460c86642436d1a69071f765ef63ca
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Montel Laurent 2013-03-21 11:05:46 +01:00 committed by The Qt Project
parent fe52d1853e
commit 0450d81190
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qmake/generators/makefiledeps.cpp
View File

@ -392,8 +392,11 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file)
#else #else
fd = open(sourceFile.local().toLatin1().constData(), O_RDONLY); fd = open(sourceFile.local().toLatin1().constData(), O_RDONLY);
#endif #endif
if(fd == -1 || fstat(fd, &fst) || S_ISDIR(fst.st_mode)) if (fd == -1 || fstat(fd, &fst) || S_ISDIR(fst.st_mode)) {
if (fd != -1)
QT_CLOSE(fd);
return false; return false;
}
buffer = getBuffer(fst.st_size); buffer = getBuffer(fst.st_size);
for(int have_read = 0; for(int have_read = 0;
(have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len)); (have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len));
@ -702,8 +705,11 @@ bool QMakeSourceFileInfo::findMocs(SourceFile *file)
#else #else
fd = open(fixPathForFile(file->file, true).local().toLocal8Bit().constData(), O_RDONLY); fd = open(fixPathForFile(file->file, true).local().toLocal8Bit().constData(), O_RDONLY);
#endif #endif
if(fd == -1 || fstat(fd, &fst) || S_ISDIR(fst.st_mode)) if (fd == -1 || fstat(fd, &fst) || S_ISDIR(fst.st_mode)) {
if (fd != -1)
QT_CLOSE(fd);
return false; //shouldn't happen return false; //shouldn't happen
}
buffer = getBuffer(fst.st_size); buffer = getBuffer(fst.st_size);
for(int have_read = buffer_len = 0; for(int have_read = buffer_len = 0;
(have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len)); (have_read = QT_READ(fd, buffer + buffer_len, fst.st_size - buffer_len));