pike.git/ src/ code/ amd64.c

2014-08-11

2014-08-11 14:36:53 by Per Hedbor <ph@opera.com>

• 2ee7d1e313bacd2db0edd2b5c76db810661351ab (17 lines) (+16/-1) ^{[ Show | Annotate ]}
  Branch: 8.0

Do not allow assignment of private variables in destructed objects.

2615:       case F_ASSIGN_PRIVATE_GLOBAL_AND_POP:    case F_ASSIGN_PRIVATE_GLOBAL: +  { +  LABELS();    ins_debug_instr_prologue(a-F_OFFSET, b, 0);    amd64_get_storage( P_REG_RBX, b ); -  +  /* do not assign if this object is destructed. */ +  mov_mem_reg( fp_reg, OFFSETOF(pike_frame,current_object), ARG1_REG ); +  mov_mem_reg( ARG1_REG, OFFSETOF(object,prog), P_REG_RAX ); +  test_reg(P_REG_RAX); +  jnz(&label_A); +  /* Note: will throw error ('cannot index destructed object' or similar). +  * Note: Only arg1 is corret here (to the destructed object) +  */ +  amd64_call_c_function(object_low_set_index); +  LABEL_A; +     amd64_free_svalue( P_REG_RBX, 0 );    amd64_load_sp_reg();   
2628:    else    {    amd64_assign_svalue_no_free( P_REG_RBX, sp_reg, -sizeof(struct svalue)); -  amd64_ref_svalue(P_REG_RBX,0); /* already have type in RAX (from assign_svalue) */ +  amd64_ref_svalue(P_REG_RBX,0);    } -  +  }    return;       case F_ASSIGN_GLOBAL: