Tue Apr 17 17:39:47 2012 UTC ()
Fix loop in a way that likely terminates before the array overflows.


(joerg)
diff -r1.17 -r1.18 pkgsrc/audio/liblastfm/Makefile
diff -r1.4 -r1.5 pkgsrc/audio/liblastfm/distinfo
diff -r0 -r1.1 pkgsrc/audio/liblastfm/patches/patch-src_fingerprint_fplib_FloatingAverage.h

cvs diff -r1.17 -r1.18 pkgsrc/audio/liblastfm/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/liblastfm/Makefile 2012/03/22 14:18:44 1.17
+++ pkgsrc/audio/liblastfm/Makefile 2012/04/17 17:39:47 1.18
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.17 2012/03/22 14:18:44 obache Exp $ 1# $NetBSD: Makefile,v 1.18 2012/04/17 17:39:47 joerg Exp $
2# 2#
3 3
4DISTNAME= mxcl-liblastfm-0.3.3-0-gf0b3239 4DISTNAME= mxcl-liblastfm-0.3.3-0-gf0b3239
5PKGNAME= liblastfm-0.3.3 5PKGNAME= liblastfm-0.3.3
6PKGREVISION= 9 6PKGREVISION= 10
7CATEGORIES= audio net 7CATEGORIES= audio net
8MASTER_SITES= http://download.github.com/ 8MASTER_SITES= http://download.github.com/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://github.com/mxcl/liblastfm 11HOMEPAGE= http://github.com/mxcl/liblastfm
12COMMENT= Library for accessing last.fm 12COMMENT= Library for accessing last.fm
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17WRKSRC= ${WRKDIR}/mxcl-liblastfm-1c739eb 17WRKSRC= ${WRKDIR}/mxcl-liblastfm-1c739eb
18 18
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++

cvs diff -r1.4 -r1.5 pkgsrc/audio/liblastfm/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/liblastfm/distinfo 2010/10/16 16:17:58 1.4
+++ pkgsrc/audio/liblastfm/distinfo 2012/04/17 17:39:47 1.5
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.4 2010/10/16 16:17:58 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2012/04/17 17:39:47 joerg Exp $
2 2
3SHA1 (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = f2e9705c9c2cbeaa14f46da9bd35ab36fe710392 3SHA1 (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = f2e9705c9c2cbeaa14f46da9bd35ab36fe710392
4RMD160 (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 690931075f38fda78c69015ca5088c166f6e1013 4RMD160 (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 690931075f38fda78c69015ca5088c166f6e1013
5Size (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 111700 bytes 5Size (mxcl-liblastfm-0.3.3-0-gf0b3239.tar.gz) = 111700 bytes
6SHA1 (patch-aa) = 2e25caf9c7e15f1c2c5a6b1d3e1ae3539710ac86 6SHA1 (patch-aa) = 2e25caf9c7e15f1c2c5a6b1d3e1ae3539710ac86
7SHA1 (patch-ab) = f9d88de85576479c903ebd165df077050f35c70e 7SHA1 (patch-ab) = f9d88de85576479c903ebd165df077050f35c70e
 8SHA1 (patch-src_fingerprint_fplib_FloatingAverage.h) = c94e81ded3df1f3f9d8e156275524d3cdc6fd926

File Added: pkgsrc/audio/liblastfm/patches/patch-src_fingerprint_fplib_FloatingAverage.h
$NetBSD: patch-src_fingerprint_fplib_FloatingAverage.h,v 1.1 2012/04/17 17:39:47 joerg Exp $

--- src/fingerprint/fplib/FloatingAverage.h.orig	2012-04-17 15:10:50.000000000 +0000
+++ src/fingerprint/fplib/FloatingAverage.h
@@ -76,7 +76,7 @@ public:
    {
       T real_sum = 0;
       const T* pCircularBuffer = m_values.get_buffer();
-      for ( int i = 0; i < size; ++i )
+      for ( int i = 0; i < size(); ++i )
          real_sum += pCircularBuffer[i];
       return abs(real_sum - m_sum) / this->size();
    }