Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(758)

Unified Diff: remoting/host/desktop_session_agent.cc

Issue 1996753002: Fix DesktopSessioAgent crash when handling nullptr OnCaptureCompleted callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Share two --pending_capture_frame_requests_ calls Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/desktop_session_agent.h ('k') | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/desktop_session_agent.cc
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc
index e7ab06325e9342f3678ff5b944fc7bf0399f4dc7..628d1c92b4ab8b5116a97d2db22946baf19944fe 100644
--- a/remoting/host/desktop_session_agent.cc
+++ b/remoting/host/desktop_session_agent.cc
@@ -326,18 +326,18 @@ void DesktopSessionAgent::OnCaptureCompleted(webrtc::DesktopFrame* frame) {
last_frame_.reset(frame);
- current_size_ = frame->size();
-
// Serialize webrtc::DesktopFrame.
SerializedDesktopFrame serialized_frame;
- serialized_frame.shared_buffer_id = frame->shared_memory()->id();
- serialized_frame.bytes_per_row = frame->stride();
- serialized_frame.dimensions = frame->size();
- serialized_frame.capture_time_ms = frame->capture_time_ms();
- serialized_frame.dpi = frame->dpi();
- for (webrtc::DesktopRegion::Iterator i(frame->updated_region());
- !i.IsAtEnd(); i.Advance()) {
- serialized_frame.dirty_region.push_back(i.rect());
+ if (frame) {
+ serialized_frame.shared_buffer_id = frame->shared_memory()->id();
+ serialized_frame.bytes_per_row = frame->stride();
+ serialized_frame.dimensions = frame->size();
+ serialized_frame.capture_time_ms = frame->capture_time_ms();
+ serialized_frame.dpi = frame->dpi();
+ for (webrtc::DesktopRegion::Iterator i(frame->updated_region());
+ !i.IsAtEnd(); i.Advance()) {
+ serialized_frame.dirty_region.push_back(i.rect());
+ }
}
SendToNetwork(base::WrapUnique(
« no previous file with comments | « remoting/host/desktop_session_agent.h ('k') | remoting/host/desktop_session_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698