diff options
| author | Damien Miller <djm@mindrot.org> | 2006-08-30 11:07:39 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-08-30 11:07:39 +1000 |
| commit | d5fe0baa73a168a1194b311aeff9fd824b038740 (patch) | |
| tree | 6a92d496be41d45e7a82a4651cc7907fe9449311 /channels.c | |
| parent | 5d43d4901496159611ab7b431caf9a9c08ecbdcd (diff) | |
- djm@cvs.openbsd.org 2006/08/29 10:40:19
[channels.c session.c]
normalise some inconsistent (but harmless) NULL pointer checks
spotted by the Stanford SATURN tool, via Isil Dillig;
ok markus@ deraadt@
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.265 2006/08/03 03:34:41 deraadt Exp $ */ +/* $OpenBSD: channels.c,v 1.266 2006/08/29 10:40:18 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -3164,9 +3164,7 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *disp, return; } - cp = disp; - if (disp) - cp = strchr(disp, ':'); + cp = strchr(disp, ':'); if (cp) cp = strchr(cp, '.'); if (cp) |