Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-10-08 19:33:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix regression: PE baddr, update uncrustify

Browse Source
This commit is contained in:
pancake 2014-05-16 02:46:07 +02:00
parent 0b48c723bf
commit 41692b70e6
4 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/anal/p/anal_nios2.c
View File

@ -91,7 +91,7 @@ static int nios2_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *b, int len)
struct r_anal_plugin_t r_anal_plugin_nios2 = {
.name = "nios2",
.desc = "brainfuck code analysis plugin",
.desc = "NIOS II code analysis plugin",
.license = "LGPL3",
.arch = R_SYS_ARCH_BF,
.bits = 32,

8
libr/bin/bin.c
View File

@ -296,13 +296,6 @@ static void r_bin_object_free (void /*RBinObject*/ *o_) {
RBinObject* o = o_;
if (!o) return;
r_bin_object_delete_items (o);
o->baddr = 0;
o->boffset = 0;
o->size = 0;
memset (o, 0, sizeof (RBinObject));
free (o);
}
// XXX - change this to RBinObject instead of RBinFile
@ -1391,7 +1384,6 @@ R_API void r_bin_list_archs(RBin *bin, int mode) {
//sdb_array_push (binfile_sdb, ARCHS_KEY, archline, 0);
}
}
}
R_API void r_bin_set_user_ptr(RBin *bin, void *user) {

4
libr/bin/p/bin_pe.c
View File

@ -88,8 +88,8 @@ static RList* sections(RBinFile *arch) {
RList *ret = NULL;
RBinSection *ptr = NULL;
struct r_bin_pe_section_t *sections = NULL;
ut64 ba = baddr (arch);
int i;
if (!(ret = r_list_new ()))
return NULL;
ret->free = free;
@ -102,7 +102,7 @@ static RList* sections(RBinFile *arch) {
ptr->size = sections[i].size;
ptr->vsize = sections[i].vsize;
ptr->offset = sections[i].offset;
ptr->rva = sections[i].rva;
ptr->rva = sections[i].rva + ba;
ptr->srwx = 0;
if (R_BIN_PE_SCN_IS_EXECUTABLE (sections[i].flags))
ptr->srwx |= 0x1;

32
sys/uncrustify.cfg
View File

@ -117,14 +117,14 @@ indent_var_def_cont = true # false/true
# True: force indentation of function definition to start in column 1
# False: use the default behavior
indent_func_def_force_col1 = false # false/true
indent_func_def_force_col1 = false # false/true
# True: indent continued function call parameters one indent level
# False: align parameters under the open paren
indent_func_call_param = true # false/true
indent_func_call_param = false # false/true
# Same as indent_func_call_param, but for function defs
indent_func_def_param = true # false/true
indent_func_def_param = false # false/true
# Same as indent_func_call_param, but for function protos
indent_func_proto_param = false # false/true
@ -229,7 +229,7 @@ indent_oc_msg_colon = 0 # number
#
# Add or remove space around arithmetic operator '+', '-', '/', '*', etc
sp_arith = force # ignore/add/remove/force
sp_arith = add # ignore/add/remove/force
# Add or remove space around assignment operator '=', '+=', etc
sp_assign = force # ignore/add/remove/force
@ -371,7 +371,7 @@ sp_inside_sparen_open = remove # ignore/add/remove/force
sp_after_sparen = remove # ignore/add/remove/force
# Add or remove space between ')' and '{' of 'if', 'for', 'switch', and 'while'
sp_sparen_brace = force # ignore/add/remove/force
sp_sparen_brace = add # ignore/add/remove/force
# Add or remove space between 'invariant' and '(' in the D language.
sp_invariant_paren = ignore # ignore/add/remove/force
@ -533,7 +533,7 @@ sp_version_paren = ignore # ignore/add/remove/force
sp_scope_paren = ignore # ignore/add/remove/force
# Add or remove space between macro and value
sp_macro = ignore # ignore/add/remove/force
sp_macro = remove # ignore/add/remove/force
# Add or remove space between macro function ')' and value
sp_macro_func = ignore # ignore/add/remove/force
@ -873,10 +873,10 @@ align_oc_decl_colon = false # false/true
#
# Whether to collapse empty blocks between '{' and '}'
nl_collapse_empty_body = false # false/true
nl_collapse_empty_body = true # false/true
# Don't split one-line braced assignments - 'foo_t f = { 1, 2 };'
nl_assign_leave_one_liners = false # false/true
nl_assign_leave_one_liners = true # false/true
# Don't split one-line braced statements inside a class xx { } body
nl_class_leave_one_liners = false # false/true
@ -1072,13 +1072,13 @@ nl_func_proto_type_name = ignore # ignore/add/remove/force
nl_func_paren = ignore # ignore/add/remove/force
# Add or remove newline between a function name and the opening '(' in the definition
nl_func_def_paren = ignore # ignore/add/remove/force
nl_func_def_paren = remove # ignore/add/remove/force
# Add or remove newline after '(' in a function declaration
nl_func_decl_start = ignore # ignore/add/remove/force
nl_func_decl_start = remove # ignore/add/remove/force
# Add or remove newline after '(' in a function definition
nl_func_def_start = ignore # ignore/add/remove/force
nl_func_def_start = remove # ignore/add/remove/force
# Overrides nl_func_decl_start when there is only one parameter.
nl_func_decl_start_single = ignore # ignore/add/remove/force
@ -1087,10 +1087,10 @@ nl_func_decl_start_single = ignore # ignore/add/remove/force
nl_func_def_start_single = ignore # ignore/add/remove/force
# Add or remove newline after each ',' in a function declaration
nl_func_decl_args = ignore # ignore/add/remove/force
nl_func_decl_args = remove # ignore/add/remove/force
# Add or remove newline after each ',' in a function definition
nl_func_def_args = ignore # ignore/add/remove/force
nl_func_def_args = remove # ignore/add/remove/force
# Add or remove newline before the ')' in a function declaration
nl_func_decl_end = ignore # ignore/add/remove/force
@ -1253,7 +1253,7 @@ ls_for_split_full = false # false/true
ls_func_split_full = false # false/true
# Whether to split lines as close to code_width as possible and ignore some groupings
ls_code_width = false # false/true
ls_code_width = true # false/true
#
# Blank line options
@ -1279,11 +1279,11 @@ nl_after_func_body_one_liner = 0 # number
# The minimum number of newlines before a multi-line comment.
# Doesn't apply if after a brace open or another multi-line comment.
nl_before_block_comment = 0 # number
nl_before_block_comment = 2 # number
# The minimum number of newlines before a single-line C comment.
# Doesn't apply if after a brace open or other single-line C comments.
nl_before_c_comment = 0 # number
nl_before_c_comment = 2 # number
# The minimum number of newlines before a CPP comment.
# Doesn't apply if after a brace open or other CPP comments.