From 98221f4e3640b2522851e49c7f81f5e500ed4a25 Mon Sep 17 00:00:00 2001
From: Aris Adamantiadis <aris@0xbadc0de.be>
Date: Wed, 20 Oct 2010 14:47:11 +0200
Subject: Fixed a bunch of smallish bugs

http://linuxtesting.org/upstream-tracker/test_results/libssh/current/test_results.html
for a whole list
---
 src/string.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/string.c')

diff --git a/src/string.c b/src/string.c
index 06042aea..33920e68 100644
--- a/src/string.c
+++ b/src/string.c
@@ -131,8 +131,12 @@ size_t ssh_string_len(struct ssh_string_struct *s) {
  * string may not be readable with regular libc functions.
  */
 char *ssh_string_to_char(struct ssh_string_struct *s) {
-  size_t len = ntohl(s->size) + 1;
-  char *new = malloc(len);
+	size_t len;
+	char *new;
+	if(s==NULL)
+		return NULL;
+  len = ntohl(s->size) + 1;
+  new = malloc(len);
 
   if (new == NULL) {
     return NULL;
-- 
cgit