Changeset 214924 in libssh2

Timestamp:

02/16/10 13:14:03 (2 years ago)

Author:

peter.stuge.se

Branches:

master

Children:

72ae08

Parents:

a49101

git-author:

Peter Stuge <peter@…> (02/16/10 13:14:03)

git-committer:

Peter Stuge <peter@…> (02/16/10 13:21:57)

Message:

Fix resource and memory leaks in examples as reported by cppcheck

Thanks to Ettl Martin for the report and patch. This fixes #132

Location:

example

Files:

• scp_write.c (modified) (1 diff)
• sftp_RW_nonblock.c (modified) (1 diff)
• sftp_write.c (modified) (2 diffs)
• x11.c (modified) (1 diff)

example/scp_write.c

@@ -198 +198 @@
     close(sock);
 #endif
+    if (local)
+        fclose(local);
     fprintf(stderr, "all done\n");
     return 0;

example/sftp_RW_nonblock.c

@@ -284 +284 @@
     close(sock);
 #endif
+    if (tempstorage)
+        fclose(tempstorage);
     printf("all done\n");
     return 0;

example/sftp_write.c

@@ -185 +185 @@
     } while (1);
 
-    fclose(local);
     libssh2_sftp_close(sftp_handle);
     libssh2_sftp_shutdown(sftp_session);
 
- shutdown:
-
+shutdown:
     libssh2_session_disconnect(session,
                                "Normal Shutdown, Thank you for playing");
@@ -200 +198 @@
     close(sock);
 #endif
-printf("all done\n");
+    if (local)
+        fclose(local);
+    printf("all done\n");
     return 0;
 }

example/x11.c

@@ -122 +122 @@
             ptr = strrchr(display, ':');
             temp_buff = (char *) calloc(strlen(ptr+1), sizeof(char));
+            if (!temp_buff) {
+                perror("calloc");
+                return;
+            }
             memcpy(temp_buff, ptr+1, strlen(ptr+1));
             display_port = atoi(temp_buff);
-
-            sock = socket(AF_UNIX,SOCK_STREAM, 0);
-            if (sock <0)
+            free(temp_buff);
+
+            sock = socket(AF_UNIX, SOCK_STREAM, 0);
+            if (sock < 0)
                 return;
             memset(&addr, 0, sizeof(addr));