github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check that remote length is non-zero

Browse Source
This commit is contained in:
Kevin Sawicki
2013-03-04 19:16:15 -08:00
parent 5005aa0c7c
commit 11b5fc14dc
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
native/v8_extensions/git.mm
View File

@@ -138,15 +138,18 @@ namespace v8_extensions {
const char *merge;
if (git_config_get_string(&remote, config, remoteKey) == GIT_OK
&& git_config_get_string(&merge, config, mergeKey) == GIT_OK) {
const char* shortMergeBranchName;
GetShortBranchName(&shortMergeBranchName, merge);
if (shortMergeBranchName != NULL) {
int updateBranchLength = strlen(remote) + strlen(shortMergeBranchName) + 14;
char* upstreamBranch = (char*) malloc(sizeof(char) * (updateBranchLength + 1));
upstreamBranch[updateBranchLength] = '\0';
sprintf(upstreamBranch, "refs/remotes/%s/%s", remote, shortMergeBranchName);
int remoteLength = strlen(remote);
if (remoteLength > 0) {
const char *shortMergeBranchName;
GetShortBranchName(&shortMergeBranchName, merge);
if (shortMergeBranchName != NULL) {
int updateBranchLength = remoteLength + strlen(shortMergeBranchName) + 14;
char* upstreamBranch = (char*) malloc(sizeof(char) * (updateBranchLength + 1));
sprintf(upstreamBranch, "refs/remotes/%s/%s", remote, shortMergeBranchName);
upstreamBranch[updateBranchLength] = '\0';
*out = upstreamBranch;
}
free((char*)shortMergeBranchName);
*out = upstreamBranch;
}
}