From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH] rawmidi: virtual: fix reading into a small buffer Date: Mon, 20 Mar 2017 10:35:10 +0100 Message-ID: References: Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 0EB65266CC6 for ; Mon, 20 Mar 2017 10:35:10 +0100 (CET) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Clemens Ladisch Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org On Sat, 18 Mar 2017 23:10:33 +0100, Clemens Ladisch wrote: > > In the special case for handling partial messages, the pointer > calculations were wrong, which would result in data corruption. > > Signed-off-by: Clemens Ladisch Applied (with Sakamoto-san's review tag) now. Thanks. Takashi > > --- alsa-lib/src/rawmidi/rawmidi_virt.c > +++ alsa-lib/src/rawmidi/rawmidi_virt.c > @@ -263,8 +263,8 @@ static ssize_t snd_rawmidi_virtual_read(snd_rawmidi_t *rmidi, void *buffer, size > } > size1 = virt->in_buf_size - virt->in_buf_ofs; > if ((size_t)size1 > size) { > - virt->in_buf_ofs += size1 - size; > - memcpy(buffer, virt->in_buf_ptr, size); > + memcpy(buffer, virt->in_buf_ptr + virt->in_buf_ofs, size); > + virt->in_buf_ofs += size; > result += size; > break; > } > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >