Bugfix: NsheadService::_status may be null

Author: chenBright

src/brpc/nshead_service.cpp

@@ -26,15 +26,13 @@ namespace brpc {
 BAIDU_CASSERT(sizeof(nshead_t) == 36, sizeof_nshead_must_be_36);
 
 NsheadService::NsheadService() : _additional_space(0) {
-    _status = new (std::nothrow) MethodStatus;
-    LOG_IF(FATAL, _status == NULL) << "Fail to new MethodStatus";
+    _status = new MethodStatus;
 }
 
 NsheadService::NsheadService(const NsheadServiceOptions& options)
     : _status(NULL), _additional_space(options.additional_space) {
     if (options.generate_status) {
-        _status = new (std::nothrow) MethodStatus;
-        LOG_IF(FATAL, _status == NULL) << "Fail to new MethodStatus";
+        _status = new MethodStatus;
     }
 }
 

src/brpc/rpc_pb_message_factory.h

@@ -65,7 +65,7 @@ namespace internal {
 // For more details, see `google::protobuf::ArenaOptions'.
 template<size_t StartBlockSize, size_t MaxBlockSize>
 struct ArenaRpcPBMessages : public RpcPBMessages {
-    struct ArenaOptionsWrapper {
+    class ArenaOptionsWrapper {
     public:
         ArenaOptionsWrapper() {
             options.start_block_size = StartBlockSize;

src/brpc/server.h

@@ -714,7 +714,7 @@ friend class Controller;
 
     template <typename T>
     int SetServiceMaxConcurrency(T* service) {
-        if (NULL != service) {
+        if (NULL != service && NULL != service->_status) {
             const AdaptiveMaxConcurrency* amc = &service->_max_concurrency;
             if (amc->type() == AdaptiveMaxConcurrency::UNLIMITED) {
                 amc = &_options.method_max_concurrency;

src/brpc/thrift_service.cpp

@@ -23,8 +23,7 @@
 namespace brpc {
 
 ThriftService::ThriftService() {
-    _status = new (std::nothrow) MethodStatus;
-    LOG_IF(FATAL, _status == NULL) << "Fail to new MethodStatus";
+    _status = new MethodStatus;
 }
 
 ThriftService::~ThriftService() {