← Back to branch summary

~ubuntu-branches/ubuntu/wily/netkit-telnet-ssl/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/022-buffer_overflow_by_HOME.diff

  • Committer: Package Import Robot
  • Author(s): Mats Erik Andersson
  • Date: 2015-04-27 23:20:22 UTC
  • mfrom: (7.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20150427232022-c2f04nl1gr4qyqom
Tags: 0.17.40+0.2-1
* Bring in package changes from experimental to unstable.
* Update to source version 0.17-40 of netkit-telnet.
  + debian/rules: Define and use the variable LDDEFS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/022-buffer_overflow_by_HOME.diff
 
1
Description: Fix buffer overflow when $HOME is large.
 
2
 Very long values of $HOME will extend beyond fixed rcbuf[128].
 
3
 In its stead, use dynamic allocation.
 
4
 
 
5
Author: Josh Martin
 
6
Bug-Debian: http://bugs.debian.org/264846
 
7
Comment: Introduced in netkit-telnet_0.17-25.
 
8
Forwarded: no
 
9
Last-Update: 2004-08-13
 
10
 
 
11
--- netkit-telnet-0.17.orig/telnet/commands.cc
 
12
+++ netkit-telnet-0.17/telnet/commands.cc
 
13
@@ -2139,22 +2139,18 @@
 
14
 }
 
15
 
 
16
 void cmdrc(const char *m1, const char *m2, const char *port) {
 
17
-    static char *rcname = 0;
 
18
-    static char rcbuf[128];
 
19
+    char *rcname = NULL;
 
20
 
 
21
     if (skiprc) return;
 
22
 
 
23
     readrc(m1, m2, port, "/etc/telnetrc");
 
24
-    if (rcname == 0) {
 
25
-       rcname = getenv("HOME");
 
26
-       if (rcname)
 
27
-           strcpy(rcbuf, rcname);
 
28
-       else
 
29
-           rcbuf[0] = '\0';
 
30
-       strcat(rcbuf, "/.telnetrc");
 
31
-       rcname = rcbuf;
 
32
-    }
 
33
+    if (asprintf (&rcname, "%s/.telnetrc", getenv ("HOME")) == -1)
 
34
+      {
 
35
+        perror ("asprintf");
 
36
+        return;
 
37
+      }
 
38
     readrc(m1, m2, port, rcname);
 
39
+    free (rcname);
 
40
 }
 
41
 
 
42
 #if defined(IP_OPTIONS) && defined(HAS_IPPROTO_IP)