Skip to content

fix crash when subdir has no childs #53

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
ont wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix crash when subdir has no childs #53

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
22 changes: 22 additions & 0 deletions cloudfsapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ int cloudfs_list_directory(const char *path, dir_entry **dir_list)
entry_count++;

dir_entry *de = (dir_entry *)malloc(sizeof(dir_entry));
de->name = NULL;
de->next = NULL;
de->size = 0;
de->last_modified = time(NULL);
Expand Down Expand Up @@ -377,6 +378,27 @@ int cloudfs_list_directory(const char *path, dir_entry **dir_list)
de->last_modified = mktime(&last_modified);
}
}

// de->name still can be empty
// ... check all properties of subdir | object
// It can be in form <subdir name="somedir/" /> with no children
xmlAttrPtr attr;
for (attr = onode->properties; attr; attr = attr->next)
{
if (!strcasecmp((const char *)attr->name, "name"))
{
de->name = strdup(attr->children->content);

// Remove trailing slash
char *slash = strrchr(de->name, '/');
if (slash && (0 == *(slash + 1)))
*slash = 0;

if (asprintf(&(de->full_name), "%s/%s", path, de->name) < 0)
de->full_name = NULL;
}
}

de->isdir = de->content_type &&
((strstr(de->content_type, "application/folder") != NULL) ||
(strstr(de->content_type, "application/directory") != NULL));
Expand Down