Skip to content

MINIFICPP-645 - Move from new to malloc in CAPI to facilitate eventua…#439

Closed
arpadboda wants to merge 1 commit intoapache:masterfrom
arpadboda:MINIFICPP-645
Closed

MINIFICPP-645 - Move from new to malloc in CAPI to facilitate eventua…#439
arpadboda wants to merge 1 commit intoapache:masterfrom
arpadboda:MINIFICPP-645

Conversation

@arpadboda
Copy link
Copy Markdown
Contributor

…l change from C++ to C

Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically master)?

  • Is your initial contribution a single, squashed commit?

For code changes:

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file?
  • If applicable, have you updated the NOTICE file?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.


flow_file_record* create_ff_object_na(const char *file, const size_t len, const uint64_t size) {
flow_file_record *new_ff = new flow_file_record;
flow_file_record *new_ff = (flow_file_record*) malloc(sizeof(flow_file_record));
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy newless year! :)

Copy link
Copy Markdown
Contributor

@phrocker phrocker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the pre-mature approval. must change the delete to free due to avoid heap corruption.

@arpadboda
Copy link
Copy Markdown
Contributor Author

arpadboda commented Nov 16, 2018

There is no delete, it was wrong before, this PR just fixes:

void free_flowfile(flow_file_record *ff) {
  if (ff == nullptr) {
    return;
  }
  auto content_repo_ptr = static_cast<std::shared_ptr<minifi::core::ContentRepository>*>(ff->crp);
  if (content_repo_ptr->get()) {
    std::shared_ptr<minifi::ResourceClaim> claim = std::make_shared<minifi::ResourceClaim>(ff->contentLocation, *content_repo_ptr);
    (*content_repo_ptr)->remove(claim);
  }
  if (ff->ffp == nullptr) {
    auto map = static_cast<string_map*>(ff->attributes);
    delete map;
  }
  free(ff->contentLocation);
  free(ff);

The last line is the one that frees.

@phrocker
Copy link
Copy Markdown
Contributor

There is no delete, it was wrong before, this PR just fixes:

void free_flowfile(flow_file_record *ff) {
  if (ff == nullptr) {
    return;
  }
  auto content_repo_ptr = static_cast<std::shared_ptr<minifi::core::ContentRepository>*>(ff->crp);
  if (content_repo_ptr->get()) {
    std::shared_ptr<minifi::ResourceClaim> claim = std::make_shared<minifi::ResourceClaim>(ff->contentLocation, *content_repo_ptr);
    (*content_repo_ptr)->remove(claim);
  }
  if (ff->ffp == nullptr) {
    auto map = static_cast<string_map*>(ff->attributes);
    delete map;
  }
  free(ff->contentLocation);
  free(ff);

The last line is the one that frees.

Ah sorry, I was referencing the fact that over the course of PRs we've gone back and forth a little between malloc/new. There is a free_flow(flow *) that still uses delete. Happy to see a different PR if you prefer to do that, but it all falls under the guise of this ticket IMO. Would you prefer I merge this and then keep the ticket open as a blocker for the free? No real preference on my part.

@asfgit asfgit closed this in 23ca420 Nov 16, 2018
nghiaxlee pushed a commit to nghiaxlee/nifi-minifi-cpp that referenced this pull request Jul 8, 2019
…l change from C++ to C

This closes apache#439.

Signed-off-by: Marc Parisi <phrocker@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants