src: use unique_ptr for http2_state

PR-URL: #17078 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Author: fhinkel

src/env-inl.h

@@ -340,7 +340,6 @@ inline Environment::~Environment(){
 delete[] heap_statistics_buffer_;
 delete[] heap_space_statistics_buffer_;
 delete[] http_parser_buffer_;
-delete http2_state_;
 free(performance_state_);
 }
 
@@ -495,12 +494,13 @@ inline void Environment::set_http_parser_buffer(char* buffer){
 }
 
 inline http2::http2_state* Environment::http2_state() const{
-return http2_state_;
+return http2_state_.get();
 }
 
-inlinevoidEnvironment::set_http2_state(http2::http2_state* buffer){
-CHECK_EQ(http2_state_, nullptr); // Should be set only once.
- http2_state_ = buffer;
+inlinevoidEnvironment::set_http2_state(
+ std::unique_ptr<http2::http2_state> buffer){
+CHECK(!http2_state_); // Should be set only once.
+ http2_state_ = std::move(buffer);
 }
 
 inlinedouble* Environment::fs_stats_field_array() const{

src/env.h

@@ -619,7 +619,7 @@ class Environment{
 inlinevoidset_http_parser_buffer(char* buffer);
 
 inline http2::http2_state* http2_state() const;
-inlinevoidset_http2_state(http2::http2_state * state);
+inlinevoidset_http2_state(std::unique_ptr<http2::http2_state> state);
 
 inlinedouble* fs_stats_field_array() const;
 inlinevoidset_fs_stats_field_array(double* fields);
@@ -737,7 +737,7 @@ class Environment{
 double* heap_space_statistics_buffer_ = nullptr;
 
 char* http_parser_buffer_;
- http2::http2_state* http2_state_ = nullptr;
+std::unique_ptr<http2::http2_state> http2_state_;
 
 double* fs_stats_field_array_;
 

src/node_http2.cc

@@ -2069,8 +2069,7 @@ void Initialize(Local<Object> target,
  Isolate* isolate = env->isolate();
  HandleScope scope(isolate);
 
- http2_state* state = newhttp2_state(isolate);
- env->set_http2_state(state);
+ std::unique_ptr<http2_state> state(newhttp2_state(isolate));
 
 #defineSET_STATE_TYPEDARRAY(name, field) \
  target->Set(context, \
@@ -2092,6 +2091,8 @@ void Initialize(Local<Object> target,
 "optionsBuffer", state->options_buffer.GetJSArray());
 #undef SET_STATE_TYPEDARRAY
 
+ env->set_http2_state(std::move(state));
+
 NODE_DEFINE_CONSTANT(target, PADDING_BUF_FRAME_LENGTH);
 NODE_DEFINE_CONSTANT(target, PADDING_BUF_MAX_PAYLOAD_LENGTH);
 NODE_DEFINE_CONSTANT(target, PADDING_BUF_RETURN_VALUE);