- added patch to check some malloc problems.
authormifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Thu, 24 Jan 2008 21:04:09 +0000 (21:04 +0000)
committermifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Thu, 24 Jan 2008 21:04:09 +0000 (21:04 +0000)
(thanks to √ėyvind Harboe for the patch)

git-svn-id: svn://svn.berlios.de/openocd/trunk@276 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/target/target.c

index f77de33939fa8dd232cf0e452f1fafd813d19261..5c1f13c1cffe258fb88d433eba903b5ee71b8ac4 100644 (file)
@@ -781,6 +781,11 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32*
                size, &checksum)) == ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
        {
                buffer = malloc(size);
+               if (buffer==NULL)
+               {
+                       ERROR("error allocating buffer for section (%d bytes)", size);
+                       return ERROR_OK;
+               }
                target_read_buffer(target, address, size, buffer);
 
                /* convert to target endianess */
@@ -1066,7 +1071,7 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a
                                
                                (*last_target_p)->dbgmsg = NULL;
                                (*last_target_p)->dbg_msg_enabled = 0;
-                               
+                                                               
                                (*last_target_p)->type->target_command(cmd_ctx, cmd, args, argc, *last_target_p);
                                
                                found = 1;
@@ -1435,10 +1440,10 @@ int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
                                break;
                        case ERROR_TARGET_TIMEOUT:
                                command_print(cmd_ctx, "target timed out... shutting down");
-                               exit(-1);
+                               return retval;
                        default:
                                command_print(cmd_ctx, "unknown error... shutting down");
-                               exit(-1);
+                               return retval;
                }
        }
        
@@ -1588,7 +1593,7 @@ int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args,
        const int line_bytecnt = 32;
        int count = 1;
        int size = 4;
-       u32 address = 0;  
+       u32 address = 0;
        int line_modulo;
        int i;
 
@@ -1920,6 +1925,11 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch
        for (i = 0; i < image.num_sections; i++)
        {
                buffer = malloc(image.sections[i].size);
+               if (buffer==NULL)
+               {
+                       command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", image.sections[i].size);
+                       break;
+               }
                if ((retval = image_read_section(&image, i, 0x0, image.sections[i].size, buffer, &buf_cnt)) != ERROR_OK)
                {
                        ERROR("image_read_section failed with error code: %i", retval);

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)