Skip to content

Commit c8347c4

Browse files
committed
patchfix release 2.2.2
1 parent 5f21416 commit c8347c4

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

gclib/GBase.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,10 @@ inline void GFree(pointer* ptr){
249249

250250
inline bool GMalloc(pointer* ptr,unsigned long size){
251251
//GASSERT(ptr);
252+
*ptr=nullptr;
252253
if (size!=0)
253254
*ptr=malloc(size);
254-
return *ptr!=NULL;
255+
return *ptr!=nullptr;
255256
}
256257

257258
// Allocate 0-filled memory

gclib/GSam.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ class GSamRecord: public GSeg {
248248
p = bam_get_qname(b);
249249

250250
strcpy(p,qname.c_str());
251-
uint16_t x = 0;
252-
251+
253252
for (int x=l;x<l+l_extranul;x++){
254253
p[x] = '\0';
255254
}

rlink.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16320,7 +16320,7 @@ void merge_exons(CGene& gene,GVec<GSeg>& exons) {
1632016320

1632116321
void update_overlap(GList<CPrediction>& pred,int p,int e,GVec<CExon>& node,OvlTracker& overlaps) {
1632216322

16323-
int n=pred.Count();
16323+
//int n=pred.Count();
1632416324
for(int i=0;i<node.Count();i++) if(!overlaps.get(node[i].predno, p)) { // there is no overlap detected yet
1632516325

1632616326
// exon e in prediction p overlaps exon ei in prediction pi

stringtie.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,11 @@ if (ballgown)
464464
#define DEF_TSTACK_SIZE 8388608
465465
size_t defStackSize=DEF_TSTACK_SIZE;
466466
#ifdef _GTHREADS_POSIX_
467-
int tstackSize=GThread::defaultStackSize();
467+
size_t tstackSize=GThread::defaultStackSize();
468468
if (tstackSize<DEF_TSTACK_SIZE) defStackSize=DEF_TSTACK_SIZE;
469469
if (verbose) {
470470
if (tstackSize<defStackSize){
471-
int ssize=defStackSize;
471+
size_t ssize=defStackSize;
472472
GMessage("Default stack size for threads: %d (increased to %d)\n", tstackSize, ssize);
473473
}
474474
else GMessage("Default stack size for threads: %d\n", tstackSize);

0 commit comments

Comments
 (0)