Merge branch 'fix_key_constraint_violation' into 'master'

Fixed key constraint violation

See merge request allnp/security_transforms!27

Former-commit-id: 8e1474a7338a451e5ee09855aaf274d30058e232

libIRDB/include/core/file.hpp

@@ -49,6 +49,7 @@ class File_t : public BaseObj_t
 	void CreateTables();
 
 	int GetELFOID() const { return elfoid; };
+	db_id_t GetFileID() const {return orig_fid; };
 
         friend class FileIR_t;
         friend class Function_t;

libtransform/src/Rewrite_Utility.cpp

@@ -149,7 +149,7 @@ Instruction_t* addNewDatabits(FileIR_t* firp, Instruction_t *p_instr, string p_b
         if (p_instr)
                 newinstr = allocateNewInstruction(firp,p_instr->GetAddress()->GetFileID(), p_instr->GetFunction());
         else
-                newinstr = allocateNewInstruction(firp,BaseObj_t::NOT_IN_DATABASE, NULL);
+                newinstr = allocateNewInstruction(firp,firp->GetFile()->GetFileID(), NULL);
 
         newinstr->SetDataBits(p_bits);
 
@@ -168,7 +168,7 @@ Instruction_t* addNewAssembly(FileIR_t* firp, Instruction_t *p_instr, string p_a
         if (p_instr)
                 newinstr = allocateNewInstruction(firp,p_instr->GetAddress()->GetFileID(), p_instr->GetFunction());
         else
-                newinstr = allocateNewInstruction(firp,BaseObj_t::NOT_IN_DATABASE, NULL);
+                newinstr = allocateNewInstruction(firp,firp->GetFile()->GetFileID(), NULL);
 
         firp->RegisterAssembly(newinstr, p_asm);