From 3e3376a4b73e0475d6e1be9cf533ea4ae0674ee3 Mon Sep 17 00:00:00 2001
From: "Gabriel M. Beddingfield" <gabrbedd@ti.com>
Date: Mon, 28 Nov 2011 17:17:00 -0600
Subject: tinycap, tinyplay: Check *argv before dereferencing.

In several places, argv is incremented and *argv is dereferenced
without checking to see if it is valid to do so.  This could lead to a
buffer overrun if the user provides invalid parameters.

This patch generally changes this:

    if (strcmp(*argv, "-r") == 0) {
        argv++;
        rate = atoi(*argv);
    }
    argv++;

To this:

    if (strcmp(*argv, "-r") == 0) {
        argv++;
        if (*argv)
            rate = atoi(*argv);
    }
    if (*argv)
        argv++;

Signed-off-by: Gabriel M. Beddingfield <gabrbedd@ti.com>
---
 tinyplay.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tinyplay.c')

diff --git a/tinyplay.c b/tinyplay.c
index 915a1ea..20b9ce3 100644
--- a/tinyplay.c
+++ b/tinyplay.c
@@ -79,9 +79,11 @@ int main(int argc, char **argv)
     while (*argv) {
         if (strcmp(*argv, "-d") == 0) {
             argv++;
-            device = atoi(*argv);
+            if (*argv)
+                device = atoi(*argv);
         }
-        argv++;
+        if (*argv)
+            argv++;
     }
 
     fread(&header, sizeof(struct wav_header), 1, file);
-- 
cgit v1.2.3


From 9989fc25deb22ba1dde0ad6c30d34e1aff1931ed Mon Sep 17 00:00:00 2001
From: "Gabriel M. Beddingfield" <gabrbedd@ti.com>
Date: Wed, 8 Feb 2012 16:19:05 -0600
Subject: tinycap, tinyplay, tinymix: Add extra parameters.

Command-line arguments are added for:

tinyplay and tinycap:
    -D n -- card number
    -p n -- period size
    -n n -- number of periods per buffer

tinymix:
    -D n -- card number

Signed-off-by: Gabriel M. Beddingfield <gabrbedd@ti.com>
---
 tinyplay.c | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

(limited to 'tinyplay.c')

diff --git a/tinyplay.c b/tinyplay.c
index 20b9ce3..2251cfe 100644
--- a/tinyplay.c
+++ b/tinyplay.c
@@ -54,17 +54,22 @@ struct wav_header {
     uint32_t data_sz;
 };
 
-void play_sample(FILE *file, unsigned int device, unsigned int channels,
-                 unsigned int rate, unsigned int bits);
+void play_sample(FILE *file, unsigned int card, unsigned int device, unsigned int channels,
+                 unsigned int rate, unsigned int bits, unsigned int period_size,
+                 unsigned int period_count);
 
 int main(int argc, char **argv)
 {
     FILE *file;
     struct wav_header header;
     unsigned int device = 0;
+    unsigned int card = 0;
+    unsigned int period_size = 1024;
+    unsigned int period_count = 4;
 
     if (argc < 2) {
-        fprintf(stderr, "Usage: %s file.wav [-d device]\n", argv[0]);
+        fprintf(stderr, "Usage: %s file.wav [-D card] [-d device] [-p period_size]"
+                " [-n n_periods] \n", argv[0]);
         return 1;
     }
 
@@ -82,6 +87,21 @@ int main(int argc, char **argv)
             if (*argv)
                 device = atoi(*argv);
         }
+        if (strcmp(*argv, "-p") == 0) {
+            argv++;
+            if (*argv)
+                period_size = atoi(*argv);
+        }
+        if (strcmp(*argv, "-n") == 0) {
+            argv++;
+            if (*argv)
+                period_count = atoi(*argv);
+        }
+        if (strcmp(*argv, "-D") == 0) {
+            argv++;
+            if (*argv)
+                card = atoi(*argv);
+        }
         if (*argv)
             argv++;
     }
@@ -98,16 +118,17 @@ int main(int argc, char **argv)
         return 1;
     }
 
-    play_sample(file, device, header.num_channels, header.sample_rate,
-                header.bits_per_sample);
+    play_sample(file, card, device, header.num_channels, header.sample_rate,
+                header.bits_per_sample, period_size, period_count);
 
     fclose(file);
 
     return 0;
 }
 
-void play_sample(FILE *file, unsigned int device, unsigned int channels,
-                 unsigned int rate, unsigned int bits)
+void play_sample(FILE *file, unsigned int card, unsigned int device, unsigned int channels,
+                 unsigned int rate, unsigned int bits, unsigned int period_size,
+                 unsigned int period_count)
 {
     struct pcm_config config;
     struct pcm *pcm;
@@ -117,8 +138,8 @@ void play_sample(FILE *file, unsigned int device, unsigned int channels,
 
     config.channels = channels;
     config.rate = rate;
-    config.period_size = 1024;
-    config.period_count = 4;
+    config.period_size = period_size;
+    config.period_count = period_count;
     if (bits == 32)
         config.format = PCM_FORMAT_S32_LE;
     else if (bits == 16)
@@ -127,7 +148,7 @@ void play_sample(FILE *file, unsigned int device, unsigned int channels,
     config.stop_threshold = 0;
     config.silence_threshold = 0;
 
-    pcm = pcm_open(0, device, PCM_OUT, &config);
+    pcm = pcm_open(card, device, PCM_OUT, &config);
     if (!pcm || !pcm_is_ready(pcm)) {
         fprintf(stderr, "Unable to open PCM device %u (%s)\n",
                 device, pcm_get_error(pcm));
-- 
cgit v1.2.3