Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 872013 - Use more robust mkdtemp() rather than relying on PID r=ehugg,jesup

Browse Source
This commit is contained in:
Adam Roach [:abr] 2013-05-15 00:32:45 -05:00
parent b33474d496
commit e9cb670024
2 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
media/webrtc/signaling/src/sipcc/core/sdp/sdp_config.c
View File

@ -23,7 +23,8 @@ tinybool sdp_verify_conf_ptr (sdp_conf_options_t *conf_p)
if ((conf_p != NULL) && (conf_p->magic_num == SDP_MAGIC_NUM)) {
return (TRUE);
} else {
CSFLogError(logTag, "SDP: Invalid Config pointer.");
CSFLogError(logTag, "SDP: Invalid Config pointer: %p (magic=0x%X)",
conf_p, conf_p ? conf_p->magic_num : 0);
return (FALSE);
}
}
@ -96,6 +97,9 @@ void *sdp_init_config ()
conf_p->num_invalid_param = 0;
conf_p->num_no_resource = 0;
CSFLogInfo(logTag, "SDP: Initialized config pointer: %p (magic=0x%X)",
conf_p, conf_p ? conf_p->magic_num : 0);
return (conf_p);
}

77
media/webrtc/signaling/src/sipcc/core/sipstack/sip_platform_task.c
View File

@ -23,6 +23,8 @@
#include "sip_socket_api.h"
#include "platform_api.h"
#include <sys/stat.h>
#include <stdio.h>
#include <unistd.h>
#include "prprf.h"
#include "thread_monitor.h"
@ -47,7 +49,7 @@
#else
#define SIP_IPC_TEMP_BASEPATH "/tmp"
#endif
#define SIP_IPC_TEMP_DIRNAME "SIP-%d"
#define SIP_IPC_TEMP_DIRNAME "SIP-XXXXXXXX"
#define SIP_MSG_SERV_SUFFIX "/Main"
#define SIP_MSG_CLNT_SUFFIX "/MsgQ"
@ -137,11 +139,13 @@ sip_platform_task_init (void)
}
/**
* sip_get_sock_dir_tmpl creates a template for the name of a directory
* where IPC sockets will live. If the TMPDIR environment is set, that is used
* as a base; otherwise SIP_IPC_TEMP_BASEPATH is used as a fallback.
* SIP_IPC_TEMP_DIRNAME is added as a child directory, and if suffix is non-null,
* that is appended to the end.
* sip_get_sock_dir returns the name of a temporary directory
* where IPC sockets will live, creating one if it does not yet exist.
*
* If the TMPDIR environment is set, that is used as a base; otherwise
* SIP_IPC_TEMP_BASEPATH is used as a fallback. SIP_IPC_TEMP_DIRAME is
* added as a child directory, and if suffix is non-null, that is
* appended to the end.
*
* The primary motivation for using TMPDIR is that that is how Fennec
* (GeckoAppShell.java) passes in a scratch directory that is guaranteed to be
@ -154,22 +158,33 @@ sip_platform_task_init (void)
* @return The length of the written output not including the NULL
* terminator, or -1 if an error occurs.
*/
static uint32_t sip_get_sock_dir_tmpl(char *out, uint32_t outlen,
const char *suffix) {
static char sip_sock_dir[sizeof(sip_serv_sock_addr.sun_path)] = "\0";
static size_t sip_sock_dir_len = 0;
static uint32_t sip_get_sock_dir(char *out, uint32_t outlen,
const char *suffix) {
const char *fname = "sip_get_sock_dir";
// Initialize the base string and create the directory
// if it hasn't been created yet.
if (!sip_sock_dir_len) {
char *tmpdir;
tmpdir = getenv("TMPDIR");
if (!tmpdir) {
tmpdir = SIP_IPC_TEMP_BASEPATH;
}
sip_sock_dir_len = PR_snprintf(sip_sock_dir, sizeof(sip_sock_dir),
"%s/%s", tmpdir, SIP_IPC_TEMP_DIRNAME);
char *tmpdir;
tmpdir = getenv("TMPDIR");
if (suffix) {
return PR_snprintf(out, outlen, "%s/%s%s",
tmpdir ? tmpdir : SIP_IPC_TEMP_BASEPATH,
SIP_IPC_TEMP_DIRNAME,
suffix);
// Note that mkdtemp modifies the string passed to it.
if (!mkdtemp(sip_sock_dir))
{
CCSIP_DEBUG_ERROR(SIP_F_PREFIX"mkdtemp() returned error"
" errno=%d\n", fname, cpr_errno);
sip_sock_dir_len = 0;
return -1;
}
}
return PR_snprintf(out, outlen, "%s/%s",
tmpdir ? tmpdir : SIP_IPC_TEMP_BASEPATH,
SIP_IPC_TEMP_DIRNAME);
return PR_snprintf(out, outlen, "%s%s", sip_sock_dir, suffix ? suffix : "");
}
/**
@ -249,7 +264,7 @@ void sip_platform_task_msgqwait (void *arg)
uint8_t num_messages = 0;
uint8_t response = 0;
boolean quit_thread = FALSE;
char template[sizeof(sip_serv_sock_addr.sun_path)];
char tempdir[sizeof(sip_serv_sock_addr.sun_path)];
if (msgq == NULL) {
CCSIP_DEBUG_ERROR(SIP_F_PREFIX"task msgq is null, exiting", fname);
@ -286,8 +301,8 @@ void sip_platform_task_msgqwait (void *arg)
* The main thread is ready. set global client socket address
* so that the server can send back response.
*/
sip_get_sock_dir_tmpl(template, sizeof(template), SIP_MSG_CLNT_SUFFIX);
cpr_set_sockun_addr(&sip_clnt_sock_addr, template, getpid());
sip_get_sock_dir(tempdir, sizeof(tempdir), SIP_MSG_CLNT_SUFFIX);
cpr_set_sockun_addr(&sip_clnt_sock_addr, tempdir, 0);
sip_ipc_clnt_socket = sip_create_IPC_sock(sip_clnt_sock_addr.sun_path);
@ -410,7 +425,6 @@ static void sip_process_int_msg (void)
syshdr = int_msg->syshdr;
if (msg != NULL && syshdr != NULL) {
if (syshdr->Cmd == THREAD_UNLOAD) {
char template[sizeof(sip_serv_sock_addr.sun_path)];
char stmpdir[sizeof(sip_serv_sock_addr.sun_path)];
/*
@ -420,8 +434,7 @@ static void sip_process_int_msg (void)
cprCloseSocket(sip_ipc_serv_socket);
unlink(sip_serv_sock_addr.sun_path);
sip_get_sock_dir_tmpl(template, sizeof(template), NULL);
PR_snprintf(stmpdir, sizeof(stmpdir), template, getpid());
sip_get_sock_dir(stmpdir, sizeof(stmpdir), NULL);
if (rmdir(stmpdir) != 0) {
CCSIP_DEBUG_ERROR(SIP_F_PREFIX"failed to remove temp dir",
fname);
@ -498,19 +511,9 @@ sip_platform_task_loop (void *arg)
* Setup IPC socket addresses for main thread (server)
*/
{
char template[sizeof(sip_serv_sock_addr.sun_path)];
char stmpdir[sizeof(sip_serv_sock_addr.sun_path)];
sip_get_sock_dir_tmpl(template, sizeof(template), NULL);
PR_snprintf(stmpdir, sizeof(stmpdir), template, getpid());
if (mkdir(stmpdir, 0700) != 0) {
CCSIP_DEBUG_ERROR(SIP_F_PREFIX"failed to create temp dir", fname);
return;
}
sip_get_sock_dir_tmpl(template, sizeof(template), SIP_MSG_SERV_SUFFIX);
cpr_set_sockun_addr(&sip_serv_sock_addr, template, getpid());
sip_get_sock_dir(stmpdir, sizeof(stmpdir), SIP_MSG_SERV_SUFFIX);
cpr_set_sockun_addr(&sip_serv_sock_addr, stmpdir, 0);
}
/*