[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/20.0.1132.21_r139451-3-1-ge2adf90

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit e2adf90bddd89bfb902fdb6f158430813b2b5367
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Mon Jun 11 16:16:37 2012 +0200

    Applied sqlite patch and fixed omnibox crash
    
    Closes: #676636

diff --git a/debian/patches/series b/debian/patches/series
index 2d4bcc8..311b071 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ arm-no-float-abi.patch
 vpx.patch
 pulseaudio.patch
 gcc4.7.patch
+sqlite.patch
diff --git a/debian/patches/sqlite.patch b/debian/patches/sqlite.patch
new file mode 100644
index 0000000..95abf36
--- /dev/null
+++ b/debian/patches/sqlite.patch
@@ -0,0 +1,28 @@
+Index: sid/src/third_party/sqlite/src/ext/fts3/fts3_write.c
+===================================================================
+--- sid.orig/src/third_party/sqlite/src/ext/fts3/fts3_write.c	2012-05-19 16:54:33.000000000 +0200
++++ sid/src/third_party/sqlite/src/ext/fts3/fts3_write.c	2012-06-11 16:16:11.607585285 +0200
+@@ -1238,13 +1238,13 @@
+   Fts3SegReader **ppReader        /* OUT: SegReader for pending-terms */
+ ){
+   Fts3SegReader *pReader = 0;     /* Fts3SegReader object to return */
++  Fts3HashElem *pE;               /* Iterator variable */
+   Fts3HashElem **aElem = 0;       /* Array of term hash entries to scan */
+   int nElem = 0;                  /* Size of array at aElem */
+   int rc = SQLITE_OK;             /* Return Code */
+ 
+   if( isPrefix ){
+     int nAlloc = 0;               /* Size of allocated array at aElem */
+-    Fts3HashElem *pE = 0;         /* Iterator variable */
+ 
+     for(pE=fts3HashFirst(&p->pendingTerms); pE; pE=fts3HashNext(pE)){
+       char *zKey = (char *)fts3HashKey(pE);
+@@ -1276,7 +1276,7 @@
+     }
+ 
+   }else{
+-    Fts3HashElem *pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
++    pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
+     if( pE ){
+       aElem = &pE;
+       nElem = 1;

-- 
Git repository for pkg-chromium