Changeset 158620 in webkit

Timestamp:

Nov 4, 2013 5:26:49 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Fixing MediaStreamDescriptor addSource and addTrack methods
​https://bugs.webkit.org/show_bug.cgi?id=123755

Patch by Thiago de Barros Lacerda <​thiago.lacerda@openbossa.org> on 2013-11-04
Reviewed by Eric Carlson.

We must store the track and source that is passed as parameter in a RefPtr,
otherwise we will refer to a null pointer.

No new tests needed.

• platform/mediastream/MediaStreamDescriptor.cpp:

(WebCore::MediaStreamDescriptor::addSource):
(WebCore::MediaStreamDescriptor::addTrack):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/MediaStreamDescriptor.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-04  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
+
+        Fixing MediaStreamDescriptor addSource and addTrack methods
+        https://bugs.webkit.org/show_bug.cgi?id=123755
+
+        Reviewed by Eric Carlson.
+
+        We must store the track and source that is passed as parameter in a RefPtr,
+        otherwise we will refer to a null pointer.
+
+        No new tests needed.
+
+        * platform/mediastream/MediaStreamDescriptor.cpp:
+        (WebCore::MediaStreamDescriptor::addSource):
+        (WebCore::MediaStreamDescriptor::addTrack):
+
 2013-11-04  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/mediastream/MediaStreamDescriptor.cpp

@@ -53 +53 @@
 }
 
-void MediaStreamDescriptor::addSource(PassRefPtr<MediaStreamSource> source)
-{
+void MediaStreamDescriptor::addSource(PassRefPtr<MediaStreamSource> prpSource)
+{
+    RefPtr<MediaStreamSource> source = prpSource;
     switch (source->type()) {
     case MediaStreamSource::Audio:
@@ -172 +173 @@
 }
 
-void MediaStreamDescriptor::addTrack(PassRefPtr<MediaStreamTrackPrivate> track)
-{
+void MediaStreamDescriptor::addTrack(PassRefPtr<MediaStreamTrackPrivate> prpTrack)
+{
+    RefPtr<MediaStreamTrackPrivate> track = prpTrack;
     if (track->ended())
         return;