cb3b77bc95
Summary: in FlipperRSocketResponder::handleFireAndForget, a responder object was being conditionally (for requests with an "id" field) created, resulting in a null pointer passed into FlipperClient::onMessageReceived when no id was present. FlipperClient::onMessage received, in the meantime, unconditionally dereferences that pointer, resulting in a segmentation fault. This change creates the responder object regardless of whether or not the "id" key is present in the request object, thus avoiding passing a null pointer into FlipperClient::onMessageReceived. Reviewed By: jknoxville Differential Revision: D18583898 fbshipit-source-id: 2112c45bc0cd639cec908d0039d6bdaed2f61491
60 lines
1.8 KiB
C++
60 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <folly/json.h>
|
|
#include "FlipperConnectionManager.h"
|
|
#include "FlipperResponder.h"
|
|
|
|
namespace facebook {
|
|
namespace flipper {
|
|
|
|
/* Responder for responding to legacy flipper applications.
|
|
Originally, flipper desktop used fireAndForget for all messages, so calling
|
|
the SDK would send a fire and forget message, to which the SDK would respond
|
|
with another one, with an id field that flipper uses to map it to the
|
|
original request. This Responder should be used when such requests are
|
|
received.
|
|
*/
|
|
class FireAndForgetBasedFlipperResponder : public FlipperResponder {
|
|
public:
|
|
FireAndForgetBasedFlipperResponder(
|
|
FlipperConnectionManager* socket,
|
|
int64_t responseID)
|
|
: socket_(socket), responseID_(responseID), idValid_(true) {}
|
|
|
|
FireAndForgetBasedFlipperResponder(FlipperConnectionManager* socket)
|
|
: socket_(socket), idValid_(false) {}
|
|
|
|
void success(const folly::dynamic& response) override {
|
|
const folly::dynamic message = idValid_
|
|
? folly::dynamic::object("id", responseID_)("success", response)
|
|
: folly::dynamic::object("success", response);
|
|
socket_->sendMessage(message);
|
|
}
|
|
|
|
void error(const folly::dynamic& response) override {
|
|
const folly::dynamic message = idValid_
|
|
? folly::dynamic::object("id", responseID_)("error", response)
|
|
: folly::dynamic::object("error", response);
|
|
socket_->sendMessage(message);
|
|
}
|
|
|
|
bool hasId() const {
|
|
return idValid_;
|
|
}
|
|
|
|
private:
|
|
FlipperConnectionManager* socket_;
|
|
int64_t responseID_;
|
|
bool idValid_;
|
|
};
|
|
|
|
} // namespace flipper
|
|
} // namespace facebook
|