From 42a25c46b844518ff0d0b920c20c519e1417be69 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Tue, 7 Jun 2016 12:26:43 -0700 Subject: Don't use sp<>& because they may end up pointing to NULL after a NULL check was performed. Bug: 28166152 Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe --- include/media/IMediaDeathNotifier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/media') diff --git a/include/media/IMediaDeathNotifier.h b/include/media/IMediaDeathNotifier.h index bb3d0d8..aca6678 100644 --- a/include/media/IMediaDeathNotifier.h +++ b/include/media/IMediaDeathNotifier.h @@ -30,7 +30,7 @@ public: virtual ~IMediaDeathNotifier() { removeObitRecipient(this); } virtual void died() = 0; - static const sp& getMediaPlayerService(); + static const sp getMediaPlayerService(); private: IMediaDeathNotifier &operator=(const IMediaDeathNotifier &); -- cgit v1.1 From 1f24c730ab6ca5aff1e3137b340b8aeaeda4bdbc Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Mon, 20 Jun 2016 17:00:14 -0700 Subject: DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak Subtract address of a random static object from pointers being routed through app process. Bug: 28466701 Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04 --- include/media/stagefright/CameraSource.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/media') diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index 069e897..6c938a5 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -236,6 +236,9 @@ private: status_t checkFrameRate(const CameraParameters& params, int32_t frameRate); + static void adjustIncomingANWBuffer(IMemory* data); + static void adjustOutgoingANWBuffer(IMemory* data); + void stopCameraRecording(); status_t reset(); -- cgit v1.1