--- a/slides/slides03.tex Mon Oct 05 20:42:11 2015 +0100
+++ b/slides/slides03.tex Tue Oct 06 09:42:58 2015 +0100
@@ -228,21 +228,24 @@
\frametitle{Behind the Scenes}
\only<2->{
-\begin{textblock}{7}(1,1)
+\begin{textblock}{7}(1,0.6)
\begin{bubble}[6.8cm]
\footnotesize
-\lstinputlisting[language=C,xleftmargin=5mm]{../progs/example1.c}
+\lstinputlisting[language=C,
+ xleftmargin=5mm,
+ belowskip=-1mm,
+ aboveskip=-1mm]{../progs/example1.c}
\end{bubble}
\end{textblock}}
\only<2>{
-\begin{textblock}{7}(5,8)
+\begin{textblock}{7}(0.5,6.6)
\footnotesize
\lstinputlisting[language={[x86masm]Assembler},morekeywords={movl},xleftmargin=5mm,numbers=none]{../progs/example1a.s}
\end{textblock}}
\only<3>{
-\begin{textblock}{7}(5,8)
+\begin{textblock}{7}(0.5,6.6)
\footnotesize
\lstinputlisting[language={[x86masm]Assembler},morekeywords={movl,movw},xleftmargin=5mm,numbers=none]{../progs/example1b.s}
\end{textblock}}
@@ -278,7 +281,7 @@
\draw[<-,line width=0.5mm] (1.1,6) -- (2.5,6);
\draw[->,line width=0.5mm] (1,4.5) -- (1.8,4.5);
- \draw (2.5,4.1) node[anchor=south] {\code{??}};
+ \draw (2.5,4.1) node[anchor=south] {\code{BBBB}};
\draw[->,line width=0.5mm] (1,3.5) -- (2.5,3.5);
\draw (2.6,3.1) node[anchor=south west] {\tt jump to \code{\\x080483f4}};
@@ -409,7 +412,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}[c]
-\frametitle{\begin{tabular}{c}Protections against\\ Buffer Overflow Attacks\end{tabular}}
+\frametitle{\begin{tabular}{c}
+ Protections against\\
+ Buffer Overflow Attacks
+ \end{tabular}}
\begin{itemize}
\item use safe library functions
@@ -421,8 +427,8 @@
\only<2>{
\begin{textblock}{7}(6,1)
- \begin{bubble}[5cm]
- \begin{tabular}{cp{2cm}}
+ \begin{bubble}[5.5cm]
+ \begin{tabular}{cp{2.9cm}}
\begin{tikzpicture}[baseline=40mm,scale=0.8]
%\draw[step=1cm] (-3,-1) grid (3,8);
\draw[gray!20,fill=gray!20] (-1, 0) rectangle (1,-1);
@@ -445,7 +451,7 @@
\draw (0,6) node[anchor=south] {\tt buf};
\draw[line width=1mm] (-1,7) -- (1,7);
\end{tikzpicture} &
- canary: a random value after the local variables
+ \raggedright stack canary: a random value after the local variables
\end{tabular}
\end{bubble}
\end{textblock}}