commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[hurd] 50/53: Fix crash on accessing vcs without a console being active


From: Samuel Thibault
Subject: [hurd] 50/53: Fix crash on accessing vcs without a console being active
Date: Thu, 20 Mar 2014 02:23:53 +0000

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit a13a5288214c6dbb25bd8da04057f8ff17750ec1
Author: Samuel Thibault <address@hidden>
Date:   Sun Mar 16 19:45:34 2014 +0100

    Fix crash on accessing vcs without a console being active
    
    * console-client/current-vcs.c (vcs_readlink): Return error as negative
    values.
    (vcs_read): Convert errors returned by vcs_readlink before returning
    them.
---
 console-client/current-vcs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/console-client/current-vcs.c b/console-client/current-vcs.c
index e88e549..f1112f9 100644
--- a/console-client/current-vcs.c
+++ b/console-client/current-vcs.c
@@ -57,7 +57,7 @@ vcs_readlink (struct iouser *user, struct node *np, char *buf)
        ret = sprintf (buf, "%s/%d", cons_file, cur);
 
       if (ret < 0)
-       ret = errno;
+       ret = -errno;
     }
   return ret;
 }
@@ -75,14 +75,14 @@ vcs_read (struct protid *user, char **data,
     {
       size = vcs_readlink (user->user, NULL, NULL);
       if (size < 0)
-       return size;
+       return -size;
 
       buf = alloca (size);
 
       err = vcs_readlink (user->user, NULL, buf);
 
       if (err < 0)
-       return err;
+       return -err;
 
       if (offset + amount > size)
        amount = size - offset;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git



reply via email to

[Prev in Thread] Current Thread [Next in Thread]