Skip to content

[security/exif] Improve memory safety profile of Exif and Field bindings #96

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
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −8
Open

[security/exif] Improve memory safety profile of Exif and Field bindings #96

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
6 changes: 3 additions & 3 deletions kamadak_exif/exif_bridge.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,15 @@ Exif::Exif(rust::reader::Exif exif) : exif_(std::move(exif)) {
mnote_fields_ = std::move(mnote_fields);
}

absl::Span<const uint8_t> Exif::buf() const {
absl::Span<const uint8_t> Exif::buf() const& {
return absl::Span<const uint8_t>(buf_);
}

absl::Span<const Field> Exif::fields() const {
absl::Span<const Field> Exif::fields() const& {
return absl::Span<const Field>(fields_);
}

absl::Span<const Field> Exif::mnote_fields() const {
absl::Span<const Field> Exif::mnote_fields() const& {
return absl::Span<const Field>(mnote_fields_);
}

Expand Down
15 changes: 10 additions & 5 deletions kamadak_exif/exif_bridge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,8 @@ class Field {
/**
* The value of this field.
*/
const Value& value() const ABSL_ATTRIBUTE_LIFETIME_BOUND { return value_; };
const Value& value() const& ABSL_ATTRIBUTE_LIFETIME_BOUND { return value_; }
const Value& value() const&& = delete;

private:
friend class Exif;
Expand Down Expand Up @@ -504,17 +505,20 @@ class Exif final {
/**
* Returns the slice that contains the TIFF data.
*/
absl::Span<const uint8_t> buf() const ABSL_ATTRIBUTE_LIFETIME_BOUND;
absl::Span<const uint8_t> buf() const& ABSL_ATTRIBUTE_LIFETIME_BOUND;
absl::Span<const uint8_t> buf() const&& = delete;

/**
* Returns a span of Exif fields.
*/
absl::Span<const Field> fields() const ABSL_ATTRIBUTE_LIFETIME_BOUND;
absl::Span<const Field> fields() const& ABSL_ATTRIBUTE_LIFETIME_BOUND;
absl::Span<const Field> fields() const&& = delete;

/**
* Returns a span of MakerNote fields.
*/
absl::Span<const Field> mnote_fields() const ABSL_ATTRIBUTE_LIFETIME_BOUND;
absl::Span<const Field> mnote_fields() const& ABSL_ATTRIBUTE_LIFETIME_BOUND;
absl::Span<const Field> mnote_fields() const&& = delete;

/**
* Returns true if the Exif data (TIFF structure) is in the
Expand Down Expand Up @@ -604,9 +608,10 @@ class ExifBytes final {
/**
* Returns a view to the Exif data.
*/
absl::Span<const uint8_t> view() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
absl::Span<const uint8_t> view() const& ABSL_ATTRIBUTE_LIFETIME_BOUND {
return absl::Span<const uint8_t>(vec_.as_ptr(), vec_.len());
}
absl::Span<const uint8_t> view() const&& = delete;

private:
friend class Writer;
Expand Down
Loading