maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #47 from glyptodon/empty-json

Browse Source 
GUAC-1172: Ensure empty directories are valid JSON.
This commit is contained in:
James Muehlner 2015-07-05 13:01:14 -07:00
commit 413ad23304
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/protocols/ssh/sftp.c
View File

@ -624,6 +624,11 @@ int guac_sftp_ls_ack_handler(guac_client* client, guac_stream* stream,
/* Complete JSON and cleanup at end of directory */ /* Complete JSON and cleanup at end of directory */
if (bytes_read <= 0) { if (bytes_read <= 0) {
/* Ensure leading brace is written */
if (list_state->entries_written == 0)
blob_written |= guac_sftp_ls_write_json(client, stream,
list_state, "{", 1);
/* Write end of JSON */ /* Write end of JSON */
guac_sftp_ls_write_json(client, stream, list_state, "}", 1); guac_sftp_ls_write_json(client, stream, list_state, "}", 1);
guac_sftp_ls_flush_json(client, stream, list_state); guac_sftp_ls_flush_json(client, stream, list_state);