wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 977372 - Close IPC'd filedescriptor from device descriptor when finished with it. r=mikeh

Browse Source
This commit is contained in:
Dave Hylands 2014-02-28 12:02:55 -08:00
parent 3b35009dde
commit 9f07169289
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/camera/DOMCameraControl.cpp
View File

@ -11,6 +11,7 @@
#include "DeviceStorage.h" #include "DeviceStorage.h"
#include "DeviceStorageFileDescriptor.h" #include "DeviceStorageFileDescriptor.h"
#include "mozilla/dom/TabChild.h" #include "mozilla/dom/TabChild.h"
#include "mozilla/FileUtils.h"
#include "mozilla/MediaManager.h" #include "mozilla/MediaManager.h"
#include "mozilla/Services.h" #include "mozilla/Services.h"
#include "mozilla/unused.h" #include "mozilla/unused.h"
@ -728,7 +729,11 @@ nsDOMCameraControl::OnCreatedFileDescriptor(bool aSucceeded)
return; return;
} }
} }
// An error occured. We need to manually close the file descriptor since
// the FileDescriptor destructor doesn't close file handles which originate
// from other processes.
int fd = mDSFileDescriptor->mFileDescriptor.PlatformHandle();
ScopedClose autoClose(fd);
OnError(CameraControlListener::kInStartRecording, NS_LITERAL_STRING("FAILURE")); OnError(CameraControlListener::kInStartRecording, NS_LITERAL_STRING("FAILURE"));
} }

4
dom/camera/GonkCameraControl.cpp
View File

@ -856,7 +856,11 @@ nsGonkCameraControl::StartRecordingImpl(DeviceStorageFileDescriptor* aFileDescri
} }
nsresult rv; nsresult rv;
// SetupRecording creates a dup of the file descriptor, and since it
// was created in the parent, the FileDescriptor destructor won't close
// it, so we go ahead and close it once we leave this function.
int fd = aFileDescriptor->mFileDescriptor.PlatformHandle(); int fd = aFileDescriptor->mFileDescriptor.PlatformHandle();
ScopedClose autoClose(fd);
if (aOptions) { if (aOptions) {
rv = SetupRecording(fd, aOptions->rotation, aOptions->maxFileSizeBytes, rv = SetupRecording(fd, aOptions->rotation, aOptions->maxFileSizeBytes,
aOptions->maxVideoLengthMs); aOptions->maxVideoLengthMs);