File tree Expand file tree Collapse file tree 3 files changed +45
-6
lines changed
SQLite3MultipleCiphers/src Expand file tree Collapse file tree 3 files changed +45
-6
lines changed Original file line number Diff line number Diff line change @@ -127426,12 +127426,20 @@ SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){
127426
127426
pKey = sqlite3KeyInfoAlloc(pParse->db, nCol, 0);
127427
127427
}
127428
127428
if( pKey ){
127429
- iDb = sqlite3SchemaToIndex(pParse->db, pIdx->pSchema);
127430
127429
assert( sqlite3KeyInfoIsWriteable(pKey) );
127431
- pKey->zIndexName = sqlite3DbStrDup(pParse->db, pIdx->zName);
127430
+
127431
+ iDb = sqlite3SchemaToIndex(pParse->db, pIdx->pSchema);
127432
127432
if( 0 <= iDb && iDb < pParse->db->nDb ){
127433
127433
pKey->zDbSName = sqlite3DbStrDup(pParse->db, pParse->db->aDb[iDb].zDbSName);
127434
+ if( pKey->zDbSName == NULL ){
127435
+ goto out_nomem;
127436
+ }
127434
127437
}
127438
+ pKey->zIndexName = sqlite3DbStrDup(pParse->db, pIdx->zName);
127439
+ if( pKey->zIndexName == NULL ){
127440
+ goto out_nomem;
127441
+ }
127442
+
127435
127443
for(i=0; i<nCol; i++){
127436
127444
const char *zColl = pIdx->azColl[i];
127437
127445
pKey->aColl[i] = zColl==sqlite3StrBINARY ? 0 :
@@ -127457,6 +127465,11 @@ SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){
127457
127465
}
127458
127466
}
127459
127467
return pKey;
127468
+ out_nomem:
127469
+ if( pKey != NULL ){
127470
+ sqlite3KeyInfoUnref(pKey);
127471
+ }
127472
+ return sqlite3OomFault(pParse->db);
127460
127473
}
127461
127474
127462
127475
#ifndef SQLITE_OMIT_CTE
Original file line number Diff line number Diff line change @@ -127426,12 +127426,20 @@ SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){
127426
127426
pKey = sqlite3KeyInfoAlloc(pParse->db, nCol, 0);
127427
127427
}
127428
127428
if( pKey ){
127429
- iDb = sqlite3SchemaToIndex(pParse->db, pIdx->pSchema);
127430
127429
assert( sqlite3KeyInfoIsWriteable(pKey) );
127431
- pKey->zIndexName = sqlite3DbStrDup(pParse->db, pIdx->zName);
127430
+
127431
+ iDb = sqlite3SchemaToIndex(pParse->db, pIdx->pSchema);
127432
127432
if( 0 <= iDb && iDb < pParse->db->nDb ){
127433
127433
pKey->zDbSName = sqlite3DbStrDup(pParse->db, pParse->db->aDb[iDb].zDbSName);
127434
+ if( pKey->zDbSName == NULL ){
127435
+ goto out_nomem;
127436
+ }
127434
127437
}
127438
+ pKey->zIndexName = sqlite3DbStrDup(pParse->db, pIdx->zName);
127439
+ if( pKey->zIndexName == NULL ){
127440
+ goto out_nomem;
127441
+ }
127442
+
127435
127443
for(i=0; i<nCol; i++){
127436
127444
const char *zColl = pIdx->azColl[i];
127437
127445
pKey->aColl[i] = zColl==sqlite3StrBINARY ? 0 :
@@ -127457,6 +127465,11 @@ SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){
127457
127465
}
127458
127466
}
127459
127467
return pKey;
127468
+ out_nomem:
127469
+ if( pKey != NULL ){
127470
+ sqlite3KeyInfoUnref(pKey);
127471
+ }
127472
+ return sqlite3OomFault(pParse->db);
127460
127473
}
127461
127474
127462
127475
#ifndef SQLITE_OMIT_CTE
Original file line number Diff line number Diff line change @@ -5635,12 +5635,20 @@ KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){
5635
5635
pKey = sqlite3KeyInfoAlloc (pParse -> db , nCol , 0 );
5636
5636
}
5637
5637
if ( pKey ){
5638
- iDb = sqlite3SchemaToIndex (pParse -> db , pIdx -> pSchema );
5639
5638
assert ( sqlite3KeyInfoIsWriteable (pKey ) );
5640
- pKey -> zIndexName = sqlite3DbStrDup (pParse -> db , pIdx -> zName );
5639
+
5640
+ iDb = sqlite3SchemaToIndex (pParse -> db , pIdx -> pSchema );
5641
5641
if ( 0 <= iDb && iDb < pParse -> db -> nDb ){
5642
5642
pKey -> zDbSName = sqlite3DbStrDup (pParse -> db , pParse -> db -> aDb [iDb ].zDbSName );
5643
+ if ( pKey -> zDbSName == NULL ){
5644
+ goto out_nomem ;
5645
+ }
5643
5646
}
5647
+ pKey -> zIndexName = sqlite3DbStrDup (pParse -> db , pIdx -> zName );
5648
+ if ( pKey -> zIndexName == NULL ){
5649
+ goto out_nomem ;
5650
+ }
5651
+
5644
5652
for (i = 0 ; i < nCol ; i ++ ){
5645
5653
const char * zColl = pIdx -> azColl [i ];
5646
5654
pKey -> aColl [i ] = zColl == sqlite3StrBINARY ? 0 :
@@ -5666,6 +5674,11 @@ KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){
5666
5674
}
5667
5675
}
5668
5676
return pKey ;
5677
+ out_nomem :
5678
+ if ( pKey != NULL ){
5679
+ sqlite3KeyInfoUnref (pKey );
5680
+ }
5681
+ return sqlite3OomFault (pParse -> db );
5669
5682
}
5670
5683
5671
5684
#ifndef SQLITE_OMIT_CTE
You can’t perform that action at this time.
0 commit comments