diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:20:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-08 17:20:23 +0000 |
commit | d8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch) | |
tree | 0ebb0db416c157fcfde51a941185819dd12d51fd /src/conversation/gnunet-helper-audio-playback.c | |
parent | 5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff) | |
download | gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip |
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/conversation/gnunet-helper-audio-playback.c')
-rw-r--r-- | src/conversation/gnunet-helper-audio-playback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index 77529e3b5..e965cb2aa 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c | |||
@@ -151,7 +151,7 @@ process_header (ogg_packet *op) | |||
151 | 151 | ||
152 | if (op->bytes < sizeof (header)) | 152 | if (op->bytes < sizeof (header)) |
153 | return NULL; | 153 | return NULL; |
154 | memcpy (&header, op->packet, sizeof (header)); | 154 | GNUNET_memcpy (&header, op->packet, sizeof (header)); |
155 | header.preskip = GNUNET_le16toh (header.preskip); | 155 | header.preskip = GNUNET_le16toh (header.preskip); |
156 | header.sampling_rate = GNUNET_le32toh (header.sampling_rate); | 156 | header.sampling_rate = GNUNET_le32toh (header.sampling_rate); |
157 | header.gain = GNUNET_le16toh (header.gain); | 157 | header.gain = GNUNET_le16toh (header.gain); |
@@ -565,7 +565,7 @@ stdin_receiver (void *cls, | |||
565 | /*Get the ogg buffer for writing*/ | 565 | /*Get the ogg buffer for writing*/ |
566 | data = ogg_sync_buffer (&oy, payload_len); | 566 | data = ogg_sync_buffer (&oy, payload_len); |
567 | /*Read bitstream from input file*/ | 567 | /*Read bitstream from input file*/ |
568 | memcpy (data, (const unsigned char *) &audio[1], payload_len); | 568 | GNUNET_memcpy (data, (const unsigned char *) &audio[1], payload_len); |
569 | ogg_sync_wrote (&oy, payload_len); | 569 | ogg_sync_wrote (&oy, payload_len); |
570 | 570 | ||
571 | ogg_demux_and_decode (); | 571 | ogg_demux_and_decode (); |
@@ -796,7 +796,7 @@ main (int argc, char *argv[]) | |||
796 | if (read_pure_ogg) | 796 | if (read_pure_ogg) |
797 | { | 797 | { |
798 | char *data = ogg_sync_buffer (&oy, ret); | 798 | char *data = ogg_sync_buffer (&oy, ret); |
799 | memcpy (data, readbuf, ret); | 799 | GNUNET_memcpy (data, readbuf, ret); |
800 | ogg_sync_wrote (&oy, ret); | 800 | ogg_sync_wrote (&oy, ret); |
801 | ogg_demux_and_decode (); | 801 | ogg_demux_and_decode (); |
802 | } | 802 | } |