Commit 781ad96
src: use OnScopeLeave instead of multiple free()
This is not great either but it avoids having to call OPENSSL_free() in
more than one branch, thus reducing the risk of memory leaks.
PR-URL: #44852
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent c7ece46 commit 781ad96
1 file changed
Lines changed: 3 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -992,18 +992,17 @@ static MaybeLocal<Value> GetX509NameObject(Environment* env, X509* cert) { | |||
| 992 | 992 | if (value_str_size < 0) { | |
| 993 | 993 | return Undefined(env->isolate()); | |
| 994 | 994 | } | |
| 995 | + auto free_value_str = OnScopeLeave([&]() { OPENSSL_free(value_str); }); | ||
| 995 | 996 | ||
| 996 | 997 | Local<String> v8_value; | |
| 997 | 998 | if (!String::NewFromUtf8(env->isolate(), | |
| 998 | 999 | reinterpret_cast<const char*>(value_str), | |
| 999 | 1000 | NewStringType::kNormal, | |
| 1000 | - value_str_size).ToLocal(&v8_value)) { | ||
| 1001 | - OPENSSL_free(value_str); | ||
| 1001 | + value_str_size) | ||
| 1002 | + .ToLocal(&v8_value)) { | ||
| 1002 | 1003 | return MaybeLocal<Value>(); | |
| 1003 | 1004 | } | |
| 1004 | 1005 | ||
| 1005 | - OPENSSL_free(value_str); | ||
| 1006 | - | ||
| 1007 | 1006 | // For backward compatibility, we only create arrays if multiple values | |
| 1008 | 1007 | // exist for the same key. That is not great but there is not much we can | |
| 1009 | 1008 | // change here without breaking things. Note that this creates nested data | |
0 commit comments