Skip to content

Fix UB from error out-params not written on success paths #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harmony7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix UB from error out-params not written on success paths #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/fastly/kv_store.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class ListResponse : public fastly::detail::RustIteratorRange<
/// Gets the next page of results.
std::optional<expected<ListPage>> next() {
fastly::sys::kv_store::ListPage *page;
fastly::sys::kv_store::KVStoreError *err;
fastly::sys::kv_store::KVStoreError *err{nullptr};
if (this->iter_->next(page, err)) {
if (err == nullptr) {
return ListPage(
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace fastly::backend {

fastly::expected<Backend> Backend::from_name(std::string_view name) {
fastly::sys::backend::Backend *out;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::backend::m_static_backend_backend_from_name(
static_cast<std::string>(name), out, err);
if (err != nullptr) {
Expand Down Expand Up @@ -214,7 +214,7 @@ BackendBuilder BackendBuilder::tcp_keepalive_time_secs(uint32_t secs) && {

fastly::expected<Backend> BackendBuilder::finish() && {
fastly::sys::backend::Backend *out;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::backend::m_backend_backend_builder_finish(
std::move(this->builder), out, err);
if (err != nullptr) {
Expand Down
6 changes: 3 additions & 3 deletions src/cpp/config_store.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace fastly::config_store {

fastly::expected<ConfigStore> ConfigStore::open(std::string_view name) {
fastly::sys::config_store::ConfigStore *out;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::config_store::m_static_config_store_config_store_open(
static_cast<std::string>(name), out, err);
if (err != nullptr) {
Expand All @@ -19,7 +19,7 @@ fastly::expected<ConfigStore> ConfigStore::open(std::string_view name) {
fastly::expected<std::optional<std::string>>
ConfigStore::get(std::string_view key) {
std::string out;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
auto some{this->cs->get(static_cast<std::string>(key), out, err)};
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -31,7 +31,7 @@ ConfigStore::get(std::string_view key) {
}

fastly::expected<bool> ConfigStore::contains(std::string_view key) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
bool out{this->cs->contains(static_cast<std::string>(key), err)};
if (err != nullptr) {
return fastly::unexpected(err);
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/device_detection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace fastly::device_detection {

fastly::expected<std::optional<Device>> lookup(std::string_view user_agent) {
fastly::sys::device_detection::Device *out;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::device_detection::f_device_detection_lookup(
static_cast<std::string>(user_agent), out, err);
if (err != nullptr) {
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/esi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ tl::expected<void, FastlyError> Processor::process_response(
Response &src_document, std::optional<Response> client_response_metadata,
std::optional<DispatchFragmentRequestFn> dispatch_fragment_request,
std::optional<ProcessFragmentResponseFn> process_fragment_response) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
// The Rust side will take ownership
auto raw_metadata =
client_response_metadata.has_value()
Expand Down Expand Up @@ -112,7 +112,7 @@ tl::expected<std::string, FastlyError> Processor::process_document(
const std::string &src_document,
std::optional<DispatchFragmentRequestFn> dispatch_fragment_request,
std::optional<ProcessFragmentResponseFn> process_fragment_response) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
// We convert the callbacks to their tag types here, or pass null if not
// present. They will be converted back to their real types when the C++
// callback bindings are invoked from Rust.
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/geo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace fastly::geo {

fastly::expected<std::optional<Geo>> geo_lookup(std::string_view ip) {
fastly::sys::geo::Geo *out;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::geo::f_geo_geo_lookup(static_cast<std::string>(ip), out, err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand Down
12 changes: 6 additions & 6 deletions src/cpp/http/body.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void Body::append(Body other) {

fastly::expected<std::size_t> Body::read(uint8_t *buf, std::size_t bufsize) {
rust::Slice<uint8_t> slice{buf, bufsize};
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
auto ret{this->bod->read(slice, err)};
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -73,7 +73,7 @@ fastly::expected<std::size_t> Body::read(uint8_t *buf, std::size_t bufsize) {

fastly::expected<std::size_t> Body::write(uint8_t *buf, std::size_t bufsize) {
rust::Slice<const uint8_t> slice{buf, bufsize};
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
auto ret{this->bod->write(slice, err)};
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -88,7 +88,7 @@ fastly::expected<std::size_t> Body::write(uint8_t *buf, std::size_t bufsize) {

fastly::expected<void> Body::append_trailer(std::string_view header_name,
std::string_view header_value) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->bod->append_trailer(static_cast<std::string>(header_name),
static_cast<std::string>(header_value), err);
if (err != nullptr) {
Expand Down Expand Up @@ -136,7 +136,7 @@ int StreamingBody::sync() {

fastly::expected<void> StreamingBody::finish() {
this->flush();
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::http::m_http_streaming_body_finish(std::move(this->bod), err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -152,7 +152,7 @@ void StreamingBody::append(Body other) {
fastly::expected<std::size_t> StreamingBody::write(uint8_t *buf,
std::size_t bufsize) {
rust::Slice<const uint8_t> slice{buf, bufsize};
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
auto ret{this->bod->write(slice, err)};
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -164,7 +164,7 @@ fastly::expected<std::size_t> StreamingBody::write(uint8_t *buf,
fastly::expected<void>
StreamingBody::append_trailer(std::string_view header_name,
std::string_view header_value) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->bod->append_trailer(static_cast<std::string>(header_name),
static_cast<std::string>(header_value), err);
if (err != nullptr) {
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/http/purge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
namespace fastly::http::purge {

fastly::expected<void> purge_surrogate_key(std::string_view surrogate_key) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::http::purge::f_http_purge_purge_surrogate_key(
static_cast<std::string>(surrogate_key), err);
if (err != nullptr) {
Expand All @@ -16,7 +16,7 @@ fastly::expected<void> purge_surrogate_key(std::string_view surrogate_key) {

fastly::expected<void>
soft_purge_surrogate_key(std::string_view surrogate_key) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::http::purge::f_http_purge_soft_purge_surrogate_key(
static_cast<std::string>(surrogate_key), err);
if (err != nullptr) {
Expand Down
34 changes: 17 additions & 17 deletions src/cpp/http/request.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ PendingRequest::poll() {

fastly::expected<Response> PendingRequest::wait() {
fastly::sys::http::Response *ret;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::http::request::m_http_request_pending_request_wait(
std::move(this->req), ret, err);
if (err != nullptr) {
Expand All @@ -52,7 +52,7 @@ select(std::vector<PendingRequest> &reqs) {
vecreqs, std::move(boxed.req));
}
fastly::sys::http::Response *resp;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::http::request::f_http_request_select(std::move(vecreqs), resp,
others, err);
std::vector<PendingRequest> ret_others;
Expand Down Expand Up @@ -154,7 +154,7 @@ fastly::expected<Response> Request::send(std::string_view backend_name) {

fastly::expected<Response> Request::send(fastly::backend::Backend &backend) {
fastly::sys::http::Response *resp;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::http::m_http_request_send(std::move(this->req), *backend.backend,
resp, err);
if (err != nullptr) {
Expand All @@ -175,7 +175,7 @@ Request::send_async(std::string_view backend_name) {
fastly::expected<request::PendingRequest>
Request::send_async(fastly::backend::Backend &backend) {
fastly::sys::http::request::PendingRequest *req;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::http::m_http_request_send_async(std::move(this->req),
*backend.backend, req, err);
if (err != nullptr) {
Expand All @@ -196,7 +196,7 @@ Request::send_async_streaming(std::string_view backend_name) {
fastly::expected<std::pair<StreamingBody, request::PendingRequest>>
Request::send_async_streaming(fastly::backend::Backend &backend) {
fastly::sys::http::request::AsyncStreamRes *res;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
fastly::sys::http::m_http_request_send_async_streaming(
std::move(this->req), *backend.backend, res, err);
if (err != nullptr) {
Expand Down Expand Up @@ -241,7 +241,7 @@ Body Request::into_body() {
}

fastly::expected<void> Request::set_body_text_plain(std::string_view body) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->set_body_text_plain(static_cast<std::string>(body), err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -257,7 +257,7 @@ Request::with_body_text_html(std::string_view body) && {
}

fastly::expected<void> Request::set_body_text_html(std::string_view body) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->set_body_text_html(static_cast<std::string>(body), err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand Down Expand Up @@ -322,7 +322,7 @@ std::optional<size_t> Request::get_content_length() {
}

fastly::expected<bool> Request::contains_header(std::string_view name) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
bool has_header{
this->req->contains_header(static_cast<std::string>(name), err)};
if (err != nullptr) {
Expand Down Expand Up @@ -350,7 +350,7 @@ fastly::expected<std::optional<HeaderValue>>
Request::get_header(std::string_view name) {
std::vector<uint8_t> value;
bool is_sensitive{false};
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
bool has_header{this->req->get_header(static_cast<std::string>(name), value,
is_sensitive, err)};
if (err != nullptr) {
Expand All @@ -366,7 +366,7 @@ Request::get_header(std::string_view name) {
fastly::expected<HeaderValuesRange>
Request::get_header_all(std::string_view name) {
fastly::sys::http::HeaderValuesIter *out;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->get_header_all(static_cast<std::string>(name), out, err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -391,7 +391,7 @@ fastly::expected<HeaderNamesRange> Request::get_header_names() {

fastly::expected<void> Request::set_header(std::string_view name,
std::string_view value) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->set_header(static_cast<std::string>(name),
static_cast<std::string>(value), err);
if (err != nullptr) {
Expand All @@ -403,7 +403,7 @@ fastly::expected<void> Request::set_header(std::string_view name,

fastly::expected<void> Request::append_header(std::string_view name,
std::string_view value) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->append_header(static_cast<std::string>(name),
static_cast<std::string>(value), err);
if (err != nullptr) {
Expand All @@ -415,7 +415,7 @@ fastly::expected<void> Request::append_header(std::string_view name,

fastly::expected<std::optional<std::string>>
Request::remove_header(std::string_view name) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
std::string out;
bool has_header{
this->req->remove_header(static_cast<std::string>(name), out, err)};
Expand Down Expand Up @@ -448,7 +448,7 @@ std::string Request::get_url() {
}

fastly::expected<void> Request::set_url(std::string_view url) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->set_url(static_cast<std::string>(url), err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -468,7 +468,7 @@ fastly::expected<Request> Request::with_path(std::string_view path) && {
}

fastly::expected<void> Request::set_path(std::string_view path) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->set_path(static_cast<std::string>(path), err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand Down Expand Up @@ -503,7 +503,7 @@ Request::with_query_string(std::string_view query) && {
}

fastly::expected<void> Request::set_query_string(std::string_view query) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->set_query_string(static_cast<std::string>(query), err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand Down Expand Up @@ -558,7 +558,7 @@ fastly::expected<Request> Request::with_surrogate_key(std::string_view sk) && {
}

fastly::expected<void> Request::set_surrogate_key(std::string_view sk) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->req->set_surrogate_key(static_cast<std::string>(sk), err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand Down
16 changes: 8 additions & 8 deletions src/cpp/http/response.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Body Response::into_body() {
}

fastly::expected<void> Response::set_body_text_plain(std::string_view body) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->res->set_body_text_plain(static_cast<std::string>(body), err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -86,7 +86,7 @@ Response::with_body_text_html(std::string_view body) && {
}

fastly::expected<void> Response::set_body_text_html(std::string_view body) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->res->set_body_text_html(static_cast<std::string>(body), err);
if (err != nullptr) {
return fastly::expected<void>();
Expand Down Expand Up @@ -151,7 +151,7 @@ std::optional<size_t> Response::get_content_length() {
}

fastly::expected<bool> Response::contains_header(std::string_view name) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
bool has_header{
this->res->contains_header(static_cast<std::string>(name), err)};
if (err != nullptr) {
Expand Down Expand Up @@ -179,7 +179,7 @@ fastly::expected<std::optional<HeaderValue>>
Response::get_header(std::string_view name) {
std::vector<uint8_t> value;
bool is_sensitive{false};
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
bool has_header{this->res->get_header(static_cast<std::string>(name), value,
is_sensitive, err)};
if (err != nullptr) {
Expand All @@ -195,7 +195,7 @@ Response::get_header(std::string_view name) {
fastly::expected<HeaderValuesRange>
Response::get_header_all(std::string_view name) {
fastly::sys::http::HeaderValuesIter *out;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->res->get_header_all(static_cast<std::string>(name), out, err);
if (err != nullptr) {
return fastly::unexpected(err);
Expand All @@ -220,7 +220,7 @@ fastly::expected<HeaderNamesRange> Response::get_header_names() {

fastly::expected<void> Response::set_header(std::string_view name,
std::string_view value) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->res->set_header(static_cast<std::string>(name),
static_cast<std::string>(value), err);
if (err != nullptr) {
Expand All @@ -232,7 +232,7 @@ fastly::expected<void> Response::set_header(std::string_view name,

fastly::expected<void> Response::append_header(std::string_view name,
std::string_view value) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
this->res->append_header(static_cast<std::string>(name),
static_cast<std::string>(value), err);
if (err != nullptr) {
Expand All @@ -244,7 +244,7 @@ fastly::expected<void> Response::append_header(std::string_view name,

fastly::expected<std::optional<std::string>>
Response::remove_header(std::string_view name) {
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
std::string out;
bool has_header{
this->res->remove_header(static_cast<std::string>(name), out, err)};
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/http/status_code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ uint16_t StatusCode::as_code() { return this->value; }
tl::expected<std::optional<std::string>, fastly::FastlyError>
StatusCode::canonical_reason() {
std::string reason;
fastly::sys::error::FastlyError *err;
fastly::sys::error::FastlyError *err{nullptr};
bool has_reason{fastly::sys::http::f_http_status_code_canonical_reason(
this->value, reason, err)};
if (err != nullptr) {
Expand Down
Loading
Loading