Skip to content

Let my patches go #930

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaley81 merged 2 commits into from
Feb 29, 2016
Merged

Let my patches go #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
731feee
Let's use a const.
joshaber Feb 29, 2016
7d41651
We'll need to free this patch.
joshaber Feb 29, 2016
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
1 change: 1 addition & 0 deletions generate/templates/manual/patches/convenient_patches.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ void GitPatch::ConvenientFromDiffWorker::Execute() {

if (nextPatch != NULL) {
baton->out->push_back(createFromRaw(nextPatch));
patchesToBeFreed.push_back(nextPatch);
}
}

Expand Down
12 changes: 6 additions & 6 deletions generate/templates/manual/src/convenient_patch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ PatchData *createFromRaw(git_patch *raw) {
hunkData->lines = new std::vector<git_diff_line *>;
hunkData->lines->reserve(hunkData->numLines);


static const int noNewlineStringLength = 29;
bool EOFFlag = false;
for (unsigned int j = 0; j < hunkData->numLines; ++j) {
git_diff_line *storeLine = (git_diff_line *)malloc(sizeof(git_diff_line));
Expand All @@ -79,9 +79,9 @@ PatchData *createFromRaw(git_patch *raw) {
// calculate strlen only once for the first line of the first hunk.
int calculatedContentLength = strlen(line->content);
if (
calculatedContentLength > 29 &&
calculatedContentLength > noNewlineStringLength &&
!strcmp(
&line->content[calculatedContentLength - 29],
&line->content[calculatedContentLength - noNewlineStringLength],
"\n\\ No newline at end of file\n"
)) {
EOFFlag = true;
Expand All @@ -96,10 +96,10 @@ PatchData *createFromRaw(git_patch *raw) {
storeLine->content_offset = line->content_offset;
char * transferContent;
if (EOFFlag) {
transferContent = (char *)malloc(storeLine->content_len + 30);
transferContent = (char *)malloc(storeLine->content_len + noNewlineStringLength + 1);
memcpy(transferContent, line->content, storeLine->content_len);
memcpy(transferContent + storeLine->content_len, "\n\\ No newline at end of file\n", 29);
transferContent[storeLine->content_len + 29] = '\0';
memcpy(transferContent + storeLine->content_len, "\n\\ No newline at end of file\n", noNewlineStringLength);
transferContent[storeLine->content_len + noNewlineStringLength] = '\0';
} else {
transferContent = (char *)malloc(storeLine->content_len + 1);
memcpy(transferContent, line->content, storeLine->content_len);
Expand Down