github/AROS-v0
1
0
Fork 0
mirror of https://github.com/deadw00d/AROS.git synced 2025-12-06 21:40:57 +00:00
Code Issues Releases Wiki Activity

Fix for memory issue in workbench editor.

Browse Source 
The was caused by a wrong alignment of some structures, and some Macros accesing their fields, using just pointer arithmetic.
Those structure where written when the code was 32 bit only. This change, although it keeps the same identical behaviour,
will now merge the pad, type and commit fields for RemLine, JoinLine, AddChar, Groupby structures inside an anoymous union.
And the pad size will now depend on the architecture size. Thanks to @Deanoburrito for his help with this solution.
This commit is contained in:
Ivan Gualandri
2025-03-24 19:19:03 +00:00
committed by deadwood
parent 47efff5e1f
commit 5c2038dae5
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
workbench/tools/Edit/UndoRedo.h
View File

@ -65,17 +65,23 @@ typedef JBUF * JBuf; /* Main type pointer */
#define OUT_OF_DATE ((STRPTR)-1)
#define NO_MEANING_VAL ((STRPTR)-2)
#define COMMIT_TYPE \
union { \
APTR helper; \
struct { \
UBYTE pad[sizeof(APTR) - (2 * sizeof(UBYTE))]; \
UBYTE commit; \
UBYTE type; \
}; \
};
/** Datatypes specific to an operation (must be WORD aligned) **/
typedef struct _AddChar
{
LINE *line; /* Line where operation occured */
UWORD pos; /* Position in this line */
UWORD nbc; /* Nb. of char inserted */
#ifdef __AROS__
UWORD pad; /* to get multiple-of-4 structure sizeof */
#endif
UBYTE commit; /* Savepoint */
UBYTE type; /* ADD_CHAR */
COMMIT_TYPE
} *AddChar;
/** Yes, no meaning changes, except type == REM_CHAR **/
@ -85,11 +91,7 @@ typedef struct _RemLine
{
LINE *line; /* Line removed */
LINE *after; /* Insert the line after this one */
#ifdef __AROS__
UWORD pad; /* to get multiple-of-4 structure sizeof */
#endif
UBYTE commit; /* Savepoint */
UBYTE type; /* REM_LINE */
COMMIT_TYPE
} *RemLine;
typedef struct _JoinLine
@ -97,20 +99,12 @@ typedef struct _JoinLine
LINE *line; /* First line concerned */
LINE *old; /* Old line removed */
ULONG pos; /* Joined position */
#ifdef __AROS__
UWORD pad; /* to get multiple-of-4 structure sizeof */
#endif
UBYTE commit; /* Savepoint */
UBYTE type; /* JOIN_LINE */
COMMIT_TYPE
} *JoinLine;
typedef struct _GroupBy /* Gather multiple operations */
{
#ifdef __AROS__
UWORD pad; /* to get multiple-of-4 structure sizeof */
#endif
UBYTE commit; /* Savepoint */
UBYTE type; /* GROUP_BY */
COMMIT_TYPE
} *GroupBy;
void flush_undo_buf ( JBuf );