[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r116838: Backport memory fix (r116838) from trunk
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] emacs-24 r116838: Backport memory fix (r116838) from trunk |
Date: |
Sun, 23 Mar 2014 06:08:04 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116838
revision-id: address@hidden
parent: address@hidden
committer: Daniel Colascione <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-03-22 23:07:54 -0700
message:
Backport memory fix (r116838) from trunk
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/process.c process.c-20091113204419-o5vbwnq5f7feedwu-462
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-03-23 06:05:54 +0000
+++ b/src/ChangeLog 2014-03-23 06:07:54 +0000
@@ -1,3 +1,9 @@
+2014-03-22 Daniel Colascione <address@hidden>
+
+ * process.c (conv_sockaddr_to_lisp): When extracting the string
+ names of AF_LOCAL sockets, stop before reading uninitialized
+ memory.
+
2014-03-23 Daniel Colascione <address@hidden>
* process.c (DATAGRAM_CONN_P): Don't underflow datagram_address
=== modified file 'src/process.c'
--- a/src/process.c 2014-03-23 06:05:54 +0000
+++ b/src/process.c 2014-03-23 06:07:54 +0000
@@ -2013,10 +2013,22 @@
case AF_LOCAL:
{
struct sockaddr_un *sockun = (struct sockaddr_un *) sa;
- for (i = 0; i < sizeof (sockun->sun_path); i++)
- if (sockun->sun_path[i] == 0)
- break;
- return make_unibyte_string (sockun->sun_path, i);
+ ptrdiff_t name_length = len - offsetof (struct sockaddr_un, sun_path);
+ /* If the first byte is NUL, the name is a Linux abstract
+ socket name, and the name can contain embedded NULs. If
+ it's not, we have a NUL-terminated string. Be careful not
+ to walk past the end of the object looking for the name
+ terminator, however. */
+ if (name_length > 0 && sockun->sun_path[0] != '\0')
+ {
+ const char* terminator =
+ memchr (sockun->sun_path, '\0', name_length);
+
+ if (terminator)
+ name_length = terminator - (const char*) sockun->sun_path;
+ }
+
+ return make_unibyte_string (sockun->sun_path, name_length);
}
#endif
default:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r116838: Backport memory fix (r116838) from trunk,
Daniel Colascione <=