asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 06:25:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

BAT: Use dynamic temp file

Browse source 
Use dynamic temp file instead of fixed temp file to store recorded
wav data, for better security.

Signed-off-by: Lu, Han <han.lu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Lu, Han 2015-10-20 16:45:48 +08:00 committed by Takashi Iwai
parent 5a48606d94
commit 2abee9c5b4
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bat/bat.c
View file

@ -450,6 +450,7 @@ static int validate_options(struct bat *bat)
static int bat_init(struct bat *bat) static int bat_init(struct bat *bat)
{ {
int err = 0; int err = 0;
char name[] = TEMP_RECORD_FILE_NAME;
/* Determine logging to a file or stdout and stderr */ /* Determine logging to a file or stdout and stderr */
if (bat->logarg) { if (bat->logarg) {
@ -472,10 +473,23 @@ static int bat_init(struct bat *bat)
} }
/* Determine capture file */ /* Determine capture file */
if (bat->local) if (bat->local) {
bat->capture.file = bat->playback.file; bat->capture.file = bat->playback.file;
else } else {
bat->capture.file = TEMP_RECORD_FILE_NAME; /* create temp file for sound record and analysis */
err = mkstemp(name);
if (err == -1) {
fprintf(bat->err, _("Fail to create record file: %d\n"),
-errno);
return -errno;
}
/* store file name which is dynamically created */
bat->capture.file = strdup(name);
if (bat->capture.file == NULL)
return -errno;
/* close temp file */
close(err);
}
/* Initial for playback */ /* Initial for playback */
if (bat->playback.file == NULL) { if (bat->playback.file == NULL) {
@ -585,8 +599,11 @@ analyze:
err = analyze_capture(&bat); err = analyze_capture(&bat);
out: out:
fprintf(bat.log, _("\nReturn value is %d\n"), err); fprintf(bat.log, _("\nReturn value is %d\n"), err);
if (bat.logarg) if (bat.logarg)
fclose(bat.log); fclose(bat.log);
if (!bat.local)
free(bat.capture.file);
return err; return err;
} }

2
bat/common.h
View file

@ -15,7 +15,7 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#define TEMP_RECORD_FILE_NAME "/tmp/bat.wav" #define TEMP_RECORD_FILE_NAME "/tmp/bat.wav.XXXXXX"
#define OPT_BASE 300 #define OPT_BASE 300
#define OPT_LOG (OPT_BASE + 1) #define OPT_LOG (OPT_BASE + 1)