From a55e2129494c2559df9fb6534356a423c6de728c Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Thu, 15 Jun 2006 13:52:31 +0000 Subject: 2006-06-15 Thomas Schwinge * hello-mt.c (trivfs_S_io_seek): Seek into the right direction for `SEEK_END'. Return EINVAL if file pointer would become negative. * hello.c (trivfs_S_io_seek): Likewise. --- trans/ChangeLog | 6 ++++++ trans/hello-mt.c | 19 +++++++++++-------- trans/hello.c | 19 +++++++++++-------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/trans/ChangeLog b/trans/ChangeLog index 47de6762..e8636aa5 100644 --- a/trans/ChangeLog +++ b/trans/ChangeLog @@ -1,3 +1,9 @@ +2006-06-15 Thomas Schwinge + + * hello-mt.c (trivfs_S_io_seek): Seek into the right direction for + `SEEK_END'. Return EINVAL if file pointer would become negative. + * hello.c (trivfs_S_io_seek): Likewise. + 2006-03-25 Thomas Schwinge [bug #15808] diff --git a/trans/hello-mt.c b/trans/hello-mt.c index cc338f92..b933cfde 100644 --- a/trans/hello-mt.c +++ b/trans/hello-mt.c @@ -1,5 +1,5 @@ /* hello-mt.c - A trivial single-file translator, multithreaded version - Copyright (C) 1998,99,2001,02 Free Software Foundation, Inc. + Copyright (C) 1998,99,2001,02,2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -195,19 +195,22 @@ trivfs_S_io_seek (struct trivfs_protid *cred, switch (whence) { - case SEEK_SET: - op->offs = offs; break; case SEEK_CUR: - op->offs += offs; break; + offs += op->offs; + goto check; case SEEK_END: - op->offs = contents_len - offs; break; + offs += contents_len; + case SEEK_SET: + check: + if (offs >= 0) + { + *new_offs = op->offs = offs; + break; + } default: err = EINVAL; } - if (! err) - *new_offs = op->offs; - mutex_unlock (&op->lock); return err; diff --git a/trans/hello.c b/trans/hello.c index d36ba848..c49feeb2 100644 --- a/trans/hello.c +++ b/trans/hello.c @@ -1,5 +1,5 @@ /* hello.c - A trivial single-file translator - Copyright (C) 1998, 1999,2001,02 Free Software Foundation, Inc. + Copyright (C) 1998,1999,2001,02,2006 Free Software Foundation, Inc. Gordon Matzigkeit , 1999 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -171,19 +171,22 @@ trivfs_S_io_seek (struct trivfs_protid *cred, op = cred->po->hook; switch (whence) { - case SEEK_SET: - op->offs = offs; break; case SEEK_CUR: - op->offs += offs; break; + offs += op->offs; + goto check; case SEEK_END: - op->offs = contents_len - offs; break; + offs += contents_len; + case SEEK_SET: + check: + if (offs >= 0) + { + *new_offs = op->offs = offs; + break; + } default: err = EINVAL; } - if (! err) - *new_offs = op->offs; - return err; } -- cgit v1.2.3